Commit 78488a64 authored by Johannes Berg's avatar Johannes Berg
Browse files

iwlwifi: mei: fix potential NULL-ptr deref 



If SKB allocation fails, continue rather than using the NULL
pointer.

Coverity CID: 1497650

Cc: stable@vger.kernel.org
Fixes: 2da4366f ("iwlwifi: mei: add the driver to allow cooperation with CSME")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20220517120045.90c1b1fd534e.Ibb42463e74d0ec7d36ec81df22e171ae1f6268b0@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 55cf1048

drivers/net/wireless/intel/iwlwifi/mei/main.c

+2 −0
Original line number Diff line number Diff line
@@ -1020,6 +1020,8 @@ static void iwl_mei_handle_sap_data(struct mei_cl_device *cldev, 


		/* We need enough room for the WiFi header + SNAP + IV */

		skb = netdev_alloc_skb(netdev, len + QOS_HDR_IV_SNAP_LEN);

		if (!skb)

			continue;



		skb_reserve(skb, QOS_HDR_IV_SNAP_LEN);

		ethhdr = skb_push(skb, sizeof(*ethhdr));