rtlwifi: fix potential NULL pointer dereference
[email protected]
maintainerPATCH 1/1 rtlwifi: fix potential NULL pointer dereference
From: Ping-Ke Shih <[email protected]>
In case dev_alloc_skb fails, the fix safely returns to avoid potential NULL pointer dereference.
Signed-off-by Ping-Ke Shih <[email protected]>
--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 ++++ 6 files changed, 14 insertions(+)
drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c +2 -0
@@ -600,6 +600,8 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +2 -0
@@ -623,6 +623,8 @@ 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)
drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c +2 -0
@@ -744,6 +744,8 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c +2 -0
@@ -448,6 +448,8 @@ void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c +2 -0
@@ -562,6 +562,8 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, u1rsvdpageloc, sizeof(u1rsvdpageloc)); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c +4 -0
@@ -1623,6 +1623,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, &reserved_page_packet_8812[0], totalpacketlen); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet_8812, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
@@ -1759,6 +1761,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, &reserved_page_packet_8821[0], totalpacketlen); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet_8821, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
Signature · 1 line
2.19.1
Thanks for reporting the cases. There are still a few more such cases; we will report them soon.
Quoted 102 lines · On 3/12/19 4:06 AM, [email protected] wrote:
From: Ping-Ke Shih <[email protected]>
In case
dev_alloc_skbfails, the fix safely returns to avoid potential NULL pointer dereference.Signed-off-by Ping-Ke Shih <[email protected]>--- drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 ++++ 6 files changed, 14 insertions(+)drivers/net/wireless/realtek/rtlwifi/rtl8188ee/fw.c +2
-0@@ -600,6 +600,8 @@ void rtl88e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +2
-0@@ -623,6 +623,8 @@ 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)drivers/net/wireless/realtek/rtlwifi/rtl8192ee/fw.c +2
-0@@ -744,6 +744,8 @@ void rtl92ee_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);drivers/net/wireless/realtek/rtlwifi/rtl8723ae/fw.c +2
-0@@ -448,6 +448,8 @@ void rtl8723e_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool b_dl_finished) u1rsvdpageloc, 3); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);drivers/net/wireless/realtek/rtlwifi/rtl8723be/fw.c +2
-0@@ -562,6 +562,8 @@ void rtl8723be_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, u1rsvdpageloc, sizeof(u1rsvdpageloc)); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);drivers/net/wireless/realtek/rtlwifi/rtl8821ae/fw.c +4
-0@@ -1623,6 +1623,8 @@ void rtl8812ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, &reserved_page_packet_8812[0], totalpacketlen); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet_8812, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);@@ -1759,6 +1761,8 @@ void rtl8821ae_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, &reserved_page_packet_8821[0], totalpacketlen); skb =dev_alloc_skb (totalpacketlen); +if (!skb) +return ;skb_put_data (skb, &reserved_page_packet_8821, totalpacketlen); rtstatus =rtl_cmd_send_packet (hw, skb);
Quoted 6 lines · <[email protected]> wrote:
From: Ping-Ke Shih <[email protected]>
In case
dev_alloc_skbfails, the fix safely returns to avoid potential NULL pointer dereference.Signed-off-by Ping-Ke Shih <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
60209d482b97 rtlwifi: fix potential NULL pointer dereference
Signature · 3 lines
https://patchwork.kernel.org/patch/10848803/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches