mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 15:02:32 +00:00
f5132df69d
Add a patch still under review to fix some errors. Refresh patch: - 003-libintl-compatibility.patch - 005-build_only_libs.patch - 006-Fix-build-on-aarch64-musl.patch Add patch: - 102-fix-potential-deref-of-null-error.patch Release notes are in the link below. Link: https://inbox.sourceware.org/elfutils-devel/CAJDtP-T3+gXqHWp3T0mejWWbPr0_1tHetEXwfB67-o+zz7ShiA@mail.gmail.com/T/#u Signed-off-by: Ryan Keane <the.ra2.ifv@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16886 Signed-off-by: Robert Marko <robimarko@gmail.com>
56 lines
1.6 KiB
Diff
56 lines
1.6 KiB
Diff
strip.c: Pointer `arhdr` created at strip.c:2741 and then dereferenced without NULL-check.
|
|
The same situation for the `arhdr` pointer at the objdump.c:313 and
|
|
the `h` pointer at the readelf.c:13545.
|
|
|
|
Triggers found by static analyzer Svace.
|
|
|
|
Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
|
|
---
|
|
src/objdump.c | 5 +++++
|
|
src/readelf.c | 5 +++++
|
|
src/strip.c | 5 +++++
|
|
3 files changed, 15 insertions(+)
|
|
|
|
--- a/src/objdump.c
|
|
+++ b/src/objdump.c
|
|
@@ -311,6 +311,11 @@ handle_ar (int fd, Elf *elf, const char
|
|
{
|
|
/* The the header for this element. */
|
|
Elf_Arhdr *arhdr = elf_getarhdr (subelf);
|
|
+ if (arhdr == NULL)
|
|
+ {
|
|
+ printf ("cannot get arhdr: %s\n", elf_errmsg (-1));
|
|
+ exit (1);
|
|
+ }
|
|
|
|
/* Skip over the index entries. */
|
|
if (strcmp (arhdr->ar_name, "/") != 0
|
|
--- a/src/readelf.c
|
|
+++ b/src/readelf.c
|
|
@@ -13543,6 +13543,11 @@ dump_archive_index (Elf *elf, const char
|
|
as_off, fname, elf_errmsg (-1));
|
|
|
|
const Elf_Arhdr *h = elf_getarhdr (subelf);
|
|
+ if (h == NULL)
|
|
+ {
|
|
+ printf ("cannot get arhdr: %s\n", elf_errmsg (-1));
|
|
+ exit (1);
|
|
+ }
|
|
|
|
printf (_("Archive member '%s' contains:\n"), h->ar_name);
|
|
|
|
--- a/src/strip.c
|
|
+++ b/src/strip.c
|
|
@@ -2739,6 +2739,11 @@ handle_ar (int fd, Elf *elf, const char
|
|
{
|
|
/* The the header for this element. */
|
|
Elf_Arhdr *arhdr = elf_getarhdr (subelf);
|
|
+ if (arhdr == NULL)
|
|
+ {
|
|
+ printf ("cannot get arhdr: %s\n", elf_errmsg (-1));
|
|
+ exit (1);
|
|
+ }
|
|
|
|
if (elf_kind (subelf) == ELF_K_ELF)
|
|
result |= handle_elf (fd, subelf, new_prefix, arhdr->ar_name, 0, NULL);
|