Commit e025da3d authored by Dan Carpenter's avatar Dan Carpenter Committed by Kalle Valo

brcm80211: potential NULL dereference in brcmf_cfg80211_vndr_cmds_dcmd_handler()

If "ret_len" is negative then it could lead to a NULL dereference.

The "ret_len" value comes from nl80211_vendor_cmd(), if it's negative
then we don't allocate the "dcmd_buf" buffer.  Then we pass "ret_len" to
brcmf_fil_cmd_data_set() where it is cast to a very high u32 value.
Most of the functions in that call tree check whether the buffer we pass
is NULL but there are at least a couple places which don't such as
brcmf_dbg_hex_dump() and brcmf_msgbuf_query_dcmd().  We memcpy() to and
from the buffer so it would result in a NULL dereference.

The fix is to change the types so that "ret_len" can't be negative.  (If
we memcpy() zero bytes to NULL, that's a no-op and doesn't cause an
issue).

Fixes: 1bacb048 ("brcmfmac: replace cfg80211 testmode with vendor command")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent e3037485
...@@ -35,9 +35,10 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy, ...@@ -35,9 +35,10 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,
struct brcmf_if *ifp; struct brcmf_if *ifp;
const struct brcmf_vndr_dcmd_hdr *cmdhdr = data; const struct brcmf_vndr_dcmd_hdr *cmdhdr = data;
struct sk_buff *reply; struct sk_buff *reply;
int ret, payload, ret_len; unsigned int payload, ret_len;
void *dcmd_buf = NULL, *wr_pointer; void *dcmd_buf = NULL, *wr_pointer;
u16 msglen, maxmsglen = PAGE_SIZE - 0x100; u16 msglen, maxmsglen = PAGE_SIZE - 0x100;
int ret;
if (len < sizeof(*cmdhdr)) { if (len < sizeof(*cmdhdr)) {
brcmf_err("vendor command too short: %d\n", len); brcmf_err("vendor command too short: %d\n", len);
...@@ -65,7 +66,7 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy, ...@@ -65,7 +66,7 @@ static int brcmf_cfg80211_vndr_cmds_dcmd_handler(struct wiphy *wiphy,
brcmf_err("oversize return buffer %d\n", ret_len); brcmf_err("oversize return buffer %d\n", ret_len);
ret_len = BRCMF_DCMD_MAXLEN; ret_len = BRCMF_DCMD_MAXLEN;
} }
payload = max(ret_len, len) + 1; payload = max_t(unsigned int, ret_len, len) + 1;
dcmd_buf = vzalloc(payload); dcmd_buf = vzalloc(payload);
if (NULL == dcmd_buf) if (NULL == dcmd_buf)
return -ENOMEM; return -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment