소스 검색

[smsc95xx] Reserve headroom in received packets

Some protocols (such as ARP) may modify the received packet and re-use
the same I/O buffer for transmission of a reply.  The SMSC95XX
transmit header is larger than the receive header: the re-used I/O
buffer therefore does not have sufficient headroom for the transmit
header, and the ARP reply will therefore fail to be transmitted.  This
is essentially the same problem as in commit 2e72d10 ("[ncm] Reserve
headroom in received packets").

Fix by reserving sufficient space at the start of each received packet
to allow for the difference between the lengths of the transmit and
receive headers.

This problem is not caught by the current driver development test
suite (documented at http://ipxe.org/dev/driver), since even the large
file transfer tests tend to completely sufficiently quickly that there
is no need for the server to ever send an ARP request.  The failure
shows up only when using a very slow protocol such as RFC7440-enhanced
TFTP (as used by Windows Deployment Services).

Signed-off-by: Michael Brown <mcb30@ipxe.org>
tags/v1.20.1
Michael Brown 8 년 전
부모
커밋
207edc4615
1개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 4
    2
      src/drivers/net/smsc95xx.c

+ 4
- 2
src/drivers/net/smsc95xx.c 파일 보기

@@ -1142,8 +1142,10 @@ static int smsc95xx_probe ( struct usb_function *func,
1142 1142
 		      &smsc95xx_in_operations, &smsc95xx_out_operations );
1143 1143
 	usb_refill_init ( &smsc95xx->usbnet.intr, 0, 0,
1144 1144
 			  SMSC95XX_INTR_MAX_FILL );
1145
-	usb_refill_init ( &smsc95xx->usbnet.in, 0, SMSC95XX_IN_MTU,
1146
-			  SMSC95XX_IN_MAX_FILL );
1145
+	usb_refill_init ( &smsc95xx->usbnet.in,
1146
+			  ( sizeof ( struct smsc95xx_tx_header ) -
1147
+			    sizeof ( struct smsc95xx_rx_header ) ),
1148
+			  SMSC95XX_IN_MTU, SMSC95XX_IN_MAX_FILL );
1147 1149
 	mii_init ( &smsc95xx->mii, &smsc95xx_mii_operations );
1148 1150
 	DBGC ( smsc95xx, "SMSC95XX %p on %s\n", smsc95xx, func->name );
1149 1151
 

Loading…
취소
저장