| Message ID | 20190312075948.1569-1-kjlu@umn.edu |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | David Miller |
| Headers | show |
| Series | net: rtl8192c: fix a potential NULL pointer dereference | expand |
On Tue, 2019-03-12 at 02:59 -0500, Kangjie Lu wrote: > In case dev_alloc_skb fails, the fix safely returns to avoid > potential NULL pointer dereference. > > Signed-off-by: Kangjie Lu <kjlu@umn.edu> > --- > drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c > b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c > index 18c76990a089..9042fc044c7e 100644 > --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c > +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c > @@ -623,6 +623,9 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, > u1rsvdpageloc, 3); > > skb = dev_alloc_skb(totalpacketlen); > + if (!skb) > + return; > + > skb_put_data(skb, &reserved_page_packet, totalpacketlen); > > if (cmd_send_packet) The subject prefix should be 'rtlwifi: ...'. Your fix is ok, but I would like to fix all failed cases of dev_alloc_skb(). I will send another patch to fix all of them. Thanks PK
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c index 18c76990a089..9042fc044c7e 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c @@ -623,6 +623,9 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, u1rsvdpageloc, 3); skb = dev_alloc_skb(totalpacketlen); + if (!skb) + return; + skb_put_data(skb, &reserved_page_packet, totalpacketlen); if (cmd_send_packet)
In case dev_alloc_skb fails, the fix safely returns to avoid potential NULL pointer dereference. Signed-off-by: Kangjie Lu <kjlu@umn.edu> --- drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 3 +++ 1 file changed, 3 insertions(+)