summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSzymon Heidrich <szymon.heidrich@gmail.com>2023-03-13 23:00:45 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-03-22 13:27:09 +0100
commit53966d572d056d6b234cfe76a5f9d60049d3c178 (patch)
tree7d7d5830e154f352f9d42587cc55dcad4c95cae4 /drivers
parent3405eb641dafcc8b28d174784b203c1622c121bf (diff)
downloadlinux-53966d572d056d6b234cfe76a5f9d60049d3c178.tar.gz
linux-53966d572d056d6b234cfe76a5f9d60049d3c178.tar.bz2
linux-53966d572d056d6b234cfe76a5f9d60049d3c178.zip
net: usb: smsc75xx: Limit packet length to skb->len
[ Upstream commit d8b228318935044dafe3a5bc07ee71a1f1424b8d ] Packet length retrieved from skb data may be larger than the actual socket buffer length (up to 9026 bytes). In such case the cloned skb passed up the network stack will leak kernel memory contents. Fixes: d0cad871703b ("smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver") Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/usb/smsc75xx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c
index 8b9fd4e071f3..b4705dee2b75 100644
--- a/drivers/net/usb/smsc75xx.c
+++ b/drivers/net/usb/smsc75xx.c
@@ -2225,7 +2225,8 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
dev->net->stats.rx_frame_errors++;
} else {
/* MAX_SINGLE_PACKET_SIZE + 4(CRC) + 2(COE) + 4(Vlan) */
- if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12))) {
+ if (unlikely(size > (MAX_SINGLE_PACKET_SIZE + ETH_HLEN + 12) ||
+ size > skb->len)) {
netif_dbg(dev, rx_err, dev->net,
"size err rx_cmd_a=0x%08x\n",
rx_cmd_a);