libdwfl: Fix some GCC10 -Wnull-dereference issues.

GCC10 on some arches will warn about possible NULL derefences.
In the libdwfl linux-kernel-modules.c cases it might be caught already
by earlier calls to get_release (). But it is hard to see that will
really always happen. So do an explicit NULL check just in case.

Signed-off-by: Mark Wielaard <mark@klomp.org>
This commit is contained in:
Mark Wielaard
2020-01-24 22:55:48 +01:00
parent 9b0fb4440a
commit 268e805de0
2 changed files with 16 additions and 3 deletions
+6
View File
@@ -1,3 +1,9 @@
2020-01-24 Mark Wielaard <mark@klomp.org>
* linux-kernel-modules.c (find_kernel_elf): Check release isn't NULL.
(report_kernel): Check release and *release aren't NULL.
(report_kernel_archive): Likewise.
2019-12-11 Omar Sandoval <osandov@fb.com>
* libdwflP.h (Dwfl_Module): Remove coalescing state.
+10 -3
View File
@@ -176,9 +176,10 @@ find_kernel_elf (Dwfl *dwfl, const char *release, char **fname)
{
/* First try to find an uncompressed vmlinux image. Possibly
including debuginfo. */
if ((release[0] == '/'
? asprintf (fname, "%s/vmlinux", release)
: asprintf (fname, "/boot/vmlinux-%s", release)) < 0)
if (release == NULL
|| ((release[0] == '/'
? asprintf (fname, "%s/vmlinux", release)
: asprintf (fname, "/boot/vmlinux-%s", release)) < 0))
return -1;
int fd = try_kernel_name (dwfl, fname, true);
@@ -241,6 +242,9 @@ report_kernel (Dwfl *dwfl, const char **release,
if (unlikely (result != 0))
return result;
if (release == NULL || *release == NULL)
return EINVAL;
char *fname;
int fd = find_kernel_elf (dwfl, *release, &fname);
@@ -296,6 +300,9 @@ report_kernel_archive (Dwfl *dwfl, const char **release,
if (unlikely (result != 0))
return result;
if (release == NULL || *release == NULL)
return EINVAL;
char *archive;
int res = (((*release)[0] == '/')
? asprintf (&archive, "%s/debug.a", *release)