Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59aabd6a authored by Iker Pedrosa's avatar Iker Pedrosa Committed by Greg Kroah-Hartman
Browse files

Staging: rtl8192e: rtllib_rx: checking NULL value after doing dev_alloc_skb 

Checking the return of dev_alloc_skb as stated in the following bug:
https://bugzilla.kernel.org/show_bug.cgi?id=60401



Reported-by: default avatarRUC_Soft_Sec <rucsoftsec@gmail.com>
Cc: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarIker Pedrosa <ikerpedrosam@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ddf62f2c

drivers/staging/rtl8192e/rtllib_rx.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -777,6 +777,8 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, 




		/* Allocate new skb for releasing to upper layer */

		/* Allocate new skb for releasing to upper layer */

		sub_skb = dev_alloc_skb(RTLLIB_SKBBUFFER_SIZE);

		sub_skb = dev_alloc_skb(RTLLIB_SKBBUFFER_SIZE);

		if (!sub_skb)

			return 0;

		skb_reserve(sub_skb, 12);

		skb_reserve(sub_skb, 12);

		data_ptr = (u8 *)skb_put(sub_skb, skb->len);

		data_ptr = (u8 *)skb_put(sub_skb, skb->len);

		memcpy(data_ptr, skb->data, skb->len);

		memcpy(data_ptr, skb->data, skb->len);
@@ -825,6 +827,8 @@ static u8 parse_subframe(struct rtllib_device *ieee, struct sk_buff *skb, 




			/* Allocate new skb for releasing to upper layer */

			/* Allocate new skb for releasing to upper layer */

			sub_skb = dev_alloc_skb(nSubframe_Length + 12);

			sub_skb = dev_alloc_skb(nSubframe_Length + 12);

			if (!sub_skb)

				return 0;

			skb_reserve(sub_skb, 12);

			skb_reserve(sub_skb, 12);

			data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length);

			data_ptr = (u8 *)skb_put(sub_skb, nSubframe_Length);

			memcpy(data_ptr, skb->data, nSubframe_Length);

			memcpy(data_ptr, skb->data, nSubframe_Length);