| Message ID | 20190312053107.5790-1-kjlu@umn.edu (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e5b9b206f3f6376b9a1406b67eafe4e7bb9f123c |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] net: mwifiex: fix a NULL pointer dereference | expand |
Kangjie Lu <kjlu@umn.edu> writes: > In case dev_alloc_skb fails, the fix returns -ENOMEM to avoid > NULL pointer dereference. > > Signed-off-by: Kangjie Lu <kjlu@umn.edu> No changelog, please always add a changelog: https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches#changelog_missing
Kangjie Lu <kjlu@umn.edu> wrote: > In case dev_alloc_skb fails, the fix returns -ENOMEM to avoid > NULL pointer dereference. > > Signed-off-by: Kangjie Lu <kjlu@umn.edu> Patch applied to wireless-drivers-next.git, thanks. e5b9b206f3f6 net: mwifiex: fix a NULL pointer dereference
diff --git a/drivers/net/wireless/marvell/mwifiex/cmdevt.c b/drivers/net/wireless/marvell/mwifiex/cmdevt.c index 60db2b969e20..8c35441fd9b7 100644 --- a/drivers/net/wireless/marvell/mwifiex/cmdevt.c +++ b/drivers/net/wireless/marvell/mwifiex/cmdevt.c @@ -341,6 +341,12 @@ static int mwifiex_dnld_sleep_confirm_cmd(struct mwifiex_adapter *adapter) sleep_cfm_tmp = dev_alloc_skb(sizeof(struct mwifiex_opt_sleep_confirm) + MWIFIEX_TYPE_LEN); + if (!sleep_cfm_tmp) { + mwifiex_dbg(adapter, ERROR, + "SLEEP_CFM: dev_alloc_skb failed\n"); + return -ENOMEM; + } + skb_put(sleep_cfm_tmp, sizeof(struct mwifiex_opt_sleep_confirm) + MWIFIEX_TYPE_LEN); put_unaligned_le32(MWIFIEX_USB_TYPE_CMD, sleep_cfm_tmp->data);
In case dev_alloc_skb fails, the fix returns -ENOMEM to avoid NULL pointer dereference. Signed-off-by: Kangjie Lu <kjlu@umn.edu> --- drivers/net/wireless/marvell/mwifiex/cmdevt.c | 6 ++++++ 1 file changed, 6 insertions(+)