Module Name: src
Committed By: martin
Date: Mon Sep 22 11:11:10 UTC 2014
Modified Files:
src/sys/dev/usb [netbsd-7]: if_smsc.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #113):
sys/dev/usb/if_smsc.c: revision 1.22
if the pkt length in rx header is < ETHER_HDR_LEN, drop it
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/dev/usb/if_smsc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.19 src/sys/dev/usb/if_smsc.c:1.19.2.1
--- src/sys/dev/usb/if_smsc.c:1.19 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/usb/if_smsc.c Mon Sep 22 11:11:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.19 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_smsc.c,v 1.19.2.1 2014/09/22 11:11:10 martin Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -1303,6 +1303,13 @@ smsc_rxeof(usbd_xfer_handle xfer, usbd_p
smsc_dbg_printf(sc, "rxeof total_len %d pktlen %d rxhdr "
"0x%08x\n", total_len, pktlen, rxhdr);
+ if (pktlen < ETHER_HDR_LEN) {
+ smsc_dbg_printf(sc, "pktlen %d < ETHER_HDR_LEN %d\n",
+ pktlen, ETHER_HDR_LEN);
+ ifp->if_ierrors++;
+ goto done;
+ }
+
pktlen += ETHER_ALIGN;
if (pktlen > MCLBYTES) {
