Commit 9426ab85 authored May 23, 2015 by Haggai Eran Committed by Sasha Levin Jul 03, 2015

staging: rtl8712: prevent buffer overrun in recvbuf2recvframe

[ Upstream commit cab462140f8a183e3cca0b51c8b59ef715cb6148 ]

With an RTL8191SU USB adaptor, sometimes the hints for a fragmented
packet are set, but the packet length is too large. Allocate enough
space to prevent memory corruption and a resulting kernel panic [1].

[1] http://www.spinics.net/lists/linux-wireless/msg136546.html



Cc: <stable@vger.kernel.org>
Signed-off-by: Haggai Eran <haggai.eran@gmail.com>
ACKed-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 15720e56

drivers/staging/rtl8712/rtl8712_recv.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1068,7 +1068,8 @@ static int recvbuf2recvframe(struct _adapter padapter, struct sk_buff pskb)
		/* for first fragment packet, driver need allocate 1536 +
		* drvinfo_sz + RXDESC_SIZE to defrag packet. */
		if ((mf == 1) && (frag == 0))
		alloc_sz = 1658;/1658+6=1664, 1664 is 128 alignment./
		/1658+6=1664, 1664 is 128 alignment./
		alloc_sz = max_t(u16, tmp_len, 1658);
		else
		alloc_sz = tmp_len;
		/* 2 is for IP header 4 bytes alignment in QoS packet case.