mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 15:15:47 +00:00
staging: brcm80211: fix potential null pointer access handling ucode buffer
Allocation of buffer in function wl_ucode_init_buf can fail. This was signalled by an error message, but code continued to access the null pointer. This is now avoided by jumping to failure label. Reviewed-by: Roland Vossen <rvossen@broadcom.com> Reviewed-by: Brett Rudley <brudley@broadcom.com> Reviewed-by: Henry Ptasinski <henryp@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
0bef7748e1
commit
8746e2baae
1 changed files with 2 additions and 0 deletions
|
@ -1707,6 +1707,7 @@ int wl_ucode_init_buf(struct wl_info *wl, void **pbuf, u32 idx)
|
|||
if (*pbuf == NULL) {
|
||||
WL_ERROR("fail to alloc %d bytes\n",
|
||||
hdr->len);
|
||||
goto fail;
|
||||
}
|
||||
bcopy(pdata, *pbuf, hdr->len);
|
||||
return 0;
|
||||
|
@ -1715,6 +1716,7 @@ int wl_ucode_init_buf(struct wl_info *wl, void **pbuf, u32 idx)
|
|||
}
|
||||
WL_ERROR("ERROR: ucode buf tag:%d can not be found!\n", idx);
|
||||
*pbuf = NULL;
|
||||
fail:
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue