55 lines
1.6 KiB
Diff
55 lines
1.6 KiB
Diff
From f4737a62033d7f3e0db740c449fc62119da7ab8a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Mon, 30 Jan 2017 16:09:51 +0100
|
|
Subject: [PATCH] brcmfmac: check brcmf_bus_get_memdump result for error
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This method may be unsupported (see: USB bus) or may just fail (see:
|
|
SDIO bus).
|
|
While at it rework logic in brcmf_sdio_bus_get_memdump function to avoid
|
|
too many conditional code nesting levels.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
.../wireless/broadcom/brcm80211/brcmfmac/debug.c | 23 +++++++++++++++-------
|
|
1 file changed, 16 insertions(+), 7 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
|
|
@@ -32,16 +32,25 @@ static int brcmf_debug_create_memdump(st
|
|
{
|
|
void *dump;
|
|
size_t ramsize;
|
|
+ int err;
|
|
|
|
ramsize = brcmf_bus_get_ramsize(bus);
|
|
- if (ramsize) {
|
|
- dump = vzalloc(len + ramsize);
|
|
- if (!dump)
|
|
- return -ENOMEM;
|
|
- memcpy(dump, data, len);
|
|
- brcmf_bus_get_memdump(bus, dump + len, ramsize);
|
|
- dev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);
|
|
+ if (!ramsize)
|
|
+ return -ENOTSUPP;
|
|
+
|
|
+ dump = vzalloc(len + ramsize);
|
|
+ if (!dump)
|
|
+ return -ENOMEM;
|
|
+
|
|
+ memcpy(dump, data, len);
|
|
+ err = brcmf_bus_get_memdump(bus, dump + len, ramsize);
|
|
+ if (err) {
|
|
+ vfree(dump);
|
|
+ return err;
|
|
}
|
|
+
|
|
+ dev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);
|
|
+
|
|
return 0;
|
|
}
|
|
|