diff options
| author | Colin Ian King <colin.king@canonical.com> | 2019-02-21 12:35:49 +0000 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2019-02-28 10:28:36 +0200 |
| commit | 74ee436f958126f96f2e10d44a8ef13cd8d46ef9 (patch) | |
| tree | b5577954509e1a9941244da95883346d5dda051e | |
| parent | c91377495192cda096e52dc09c266b0d05f16d86 (diff) | |
| download | linux-74ee436f958126f96f2e10d44a8ef13cd8d46ef9.tar.bz2 | |
rsi: fix missing null pointer check from a failed ieee80211_probereq_get call
The call to ieee80211_probereq_get can return NULL if a skb allocation
fails, so add a null pointer check and free an earlier skb on the error
exit return path.
Fixes: 7fdcb8e12660 ("rsi: add support for hardware scan offload")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
| -rw-r--r-- | drivers/net/wireless/rsi/rsi_91x_mgmt.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index 8c17842ac507..844f2fac298f 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -1726,6 +1726,10 @@ int rsi_send_bgscan_probe_req(struct rsi_common *common, probereq_skb = ieee80211_probereq_get(common->priv->hw, vif->addr, ssid, ssid_len, scan_req->ie_len); + if (!probereq_skb) { + dev_kfree_skb(skb); + return -ENOMEM; + } memcpy(&skb->data[frame_len], probereq_skb->data, probereq_skb->len); |