diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-01-31 19:28:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-01-31 19:28:45 +0000 |
| commit | 13f6cabdcd418d606590bafb2c758b2c146bd082 (patch) | |
| tree | 2f320d2aec343d16266c192d520f957e05cf3b5a | |
| parent | 211cf627d14d982e406aee25d97c639c119741e9 (diff) | |
| parent | c1b5f830404d6c132c5dbee7cd4681fb1c678c1a (diff) | |
| download | elfutils-13f6cabdcd418d606590bafb2c758b2c146bd082.tar.gz | |
Merge "dwfl: fix potential overflow when reporting on kernel modules" am: 325ecbcd3c am: c7d887b3c9 am: f2fd5fd305 am: c1b5f83040
Original change: https://android-review.googlesource.com/c/platform/external/elfutils/+/1960724
Change-Id: I23d6ff311195488a3cc3b23bd41bdbbdef4085c2
| -rw-r--r-- | libdwfl/ChangeLog | 5 | ||||
| -rw-r--r-- | libdwfl/linux-kernel-modules.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index f7e24a21..57b2c494 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2021-11-18 Matthias Maennich <maennich@google.com> + + * linux-kernel-modules.c (dwfl_linux_kernel_report_modules): + Add one to modname array size. + 2021-02-14 Alexander Miller <alex.miller@gmx.de> * core-file.c (dwfl_core_file_report): Move NEW_VERSION before diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index c0f8dfa4..58c0c417 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -1008,7 +1008,7 @@ dwfl_linux_kernel_report_modules (Dwfl *dwfl) int result = 0; Dwarf_Addr modaddr; unsigned long int modsz; - char modname[128]; + char modname[128+1]; char *line = NULL; size_t linesz = 0; /* We can't just use fscanf here because it's not easy to distinguish \n |