OSDN Git Service

ath10k: fix null dereference on pointer crash_data
authorColin Ian King <colin.king@canonical.com>
Fri, 4 Oct 2019 16:02:27 +0000 (17:02 +0100)
committerKalle Valo <kvalo@codeaurora.org>
Fri, 11 Oct 2019 08:45:53 +0000 (11:45 +0300)
Currently when pointer crash_data is null the present null check
will also check that crash_data->ramdump_buf is null and will cause
a null pointer dereference on crash_data. Fix this by using the ||
operator instead of &&.

Fixes: 3f14b73c3843 ("ath10k: Enable MSA region dump support for WCN3990")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/ath/ath10k/snoc.c

index cd22c86..1617749 100644 (file)
@@ -1400,7 +1400,7 @@ static void ath10k_msa_dump_memory(struct ath10k *ar,
        size_t buf_len;
        u8 *buf;
 
-       if (!crash_data && !crash_data->ramdump_buf)
+       if (!crash_data || !crash_data->ramdump_buf)
                return;
 
        mem_layout = ath10k_coredump_get_mem_layout(ar);