| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 |
- 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>
- ---
- --- 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;
- }
-
|
