From 5b7d45d32a59a27ea302e4d28ef8d595bcd6a5c7 Mon Sep 17 00:00:00 2001 From: Keith Seitz Date: Wed, 18 Nov 2020 12:57:53 -0800 Subject: [PATCH] Squash coverity warning for REVERSE_INULL in dump_note_entry_p Coverity detected a "defect" in dump_note_entry_p in linux-tdep.c: static int dump_note_entry_p (filter_flags filterflags, const struct smaps_vmflags *v, int maybe_private_p, int mapping_anon_p, int mapping_file_p, const char *filename, ULONGEST addr, ULONGEST offset) { /* vDSO and vsyscall mappings will end up in the core file. Don't put them in the NT_FILE note. */ if (strcmp ("[vdso]", filename) == 0 || strcmp ("[vsyscall]", filename) == 0) return 0; /* Otherwise, any other file-based mapping should be placed in the note. */ return filename != nullptr; } Those strcmp's will derefernce `filename' so there is little point to checking whether it is non-NULL or not; we would have already segfaulted. It also cannot be nullptr because its value is read directly from /proc/PID/maps. The "worst" it can be is an empty string. gdb/ChangeLog 2020-11-18 Keith Seitz * linux-tdep.c (dump_note_entry_p): Return true instead of checking `filename'. --- gdb/ChangeLog | 5 +++++ gdb/linux-tdep.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 18c8c0dc08e..1c0029da355 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2020-11-18 Keith Seitz + + * linux-tdep.c (dump_note_entry_p): Return true instead of + checking `filename'. + 2020-11-18 Tom de Vries * debuginfod-support.c (debuginfod_source_query) diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index bacb61398fa..8f7bbd5c234 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -742,7 +742,7 @@ dump_note_entry_p (filter_flags filterflags, const struct smaps_vmflags *v, /* Otherwise, any other file-based mapping should be placed in the note. */ - return filename != nullptr; + return 1; } /* Implement the "info proc" command. */ -- 2.30.2