Skip to content

Commit b416898

Browse files
marcinguy-blipgregkh
authored andcommitted
net: usb: aqc111: Fix out-of-bounds accesses in RX fixup
[ Upstream commit afb8e24 ] aqc111_rx_fixup() contains several out-of-bounds accesses that can be triggered by a malicious (or defective) USB device, in particular: - The metadata array (desc_offset..desc_offset+2*pkt_count) can be out of bounds, causing OOB reads and (on big-endian systems) OOB endianness flips. - A packet can overlap the metadata array, causing a later OOB endianness flip to corrupt data used by a cloned SKB that has already been handed off into the network stack. - A packet SKB can be constructed whose tail is far beyond its end, causing out-of-bounds heap data to be considered part of the SKB's data. Found doing variant analysis. Tested it with another driver (ax88179_178a), since I don't have a aqc111 device to test it, but the code looks very similar. Signed-off-by: Marcin Kozlowski <marcinguy@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent c3f86ae commit b416898

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

drivers/net/usb/aqc111.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1102,10 +1102,15 @@ static int aqc111_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
11021102
if (start_of_descs != desc_offset)
11031103
goto err;
11041104

1105-
/* self check desc_offset from header*/
1106-
if (desc_offset >= skb_len)
1105+
/* self check desc_offset from header and make sure that the
1106+
* bounds of the metadata array are inside the SKB
1107+
*/
1108+
if (pkt_count * 2 + desc_offset >= skb_len)
11071109
goto err;
11081110

1111+
/* Packets must not overlap the metadata array */
1112+
skb_trim(skb, desc_offset);
1113+
11091114
if (pkt_count == 0)
11101115
goto err;
11111116

0 commit comments

Comments
 (0)