arch: powerpc/fadump: Cleaning up inconsistent NULL checks

Cleaning up inconsistent NULL checks.
There is otherwise a risk of a possible null pointer dereference.

Was largely found by using a static code analysis program called cppcheck.

Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c
index 02667744fbb5..d55e8986730a 100644
--- a/arch/powerpc/kernel/fadump.c
+++ b/arch/powerpc/kernel/fadump.c
@@ -646,7 +646,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
                 }
                 /* Lower 4 bytes of reg_value contains logical cpu id */
                 cpu = reg_entry->reg_value & FADUMP_CPU_ID_MASK;
-                if (!cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) {
+                if (fdh && !cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) {
                         SKIP_TO_NEXT_CPU(reg_entry);
                         continue;
                 }
@@ -663,9 +663,11 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm)
         }
         fadump_final_note(note_buf);
 
-        pr_debug("Updating elfcore header (%llx) with cpu notes\n",
+        if (fdh) {
+                pr_debug("Updating elfcore header (%llx) with cpu notes\n",
                                                         fdh->elfcorehdr_addr);
-        fadump_update_elfcore_header((char *)__va(fdh->elfcorehdr_addr));
+                fadump_update_elfcore_header((char *)__va(fdh->elfcorehdr_addr));
+        }
         return 0;
 
 error_out: