* [PATCH 1 2.4.27] pcnet32: discard oversize rx packets
@ 2004-08-09 23:14 Don Fry
2004-09-17 15:29 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Don Fry @ 2004-08-09 23:14 UTC (permalink / raw)
To: tsbogend, jgarzik, netdev
This patch will discard received frames that are larger than one buffer.
Signed-off-by: Don Fry <brazilnut@us.ibm.com>
--- linux-2.4.27/drivers/net/orig.pcnet32.c Mon Aug 9 15:41:19 2004
+++ linux-2.4.27/drivers/net/pcnet32.c Mon Aug 9 15:41:31 2004
@@ -22,8 +22,8 @@
*************************************************************************/
#define DRV_NAME "pcnet32"
-#define DRV_VERSION "1.30c"
-#define DRV_RELDATE "05.25.2004"
+#define DRV_VERSION "1.30d"
+#define DRV_RELDATE "06.01.2004"
#define PFX DRV_NAME ": "
static const char *version =
@@ -245,6 +245,7 @@ static int full_duplex[MAX_UNITS];
* v1.30b 24 May 2004 Don Fry fix bogus tx carrier errors with 79c973,
* assisted by Bruce Penrod <bmpenrod@endruntechnologies.com>.
* v1.30c 25 May 2004 Don Fry added netif_wake_queue after pcnet32_restart.
+ * v1.30d 01 Jun 2004 Don Fry discard oversize rx packets.
*/
@@ -1904,7 +1905,13 @@ pcnet32_rx(struct net_device *dev)
short pkt_len = (le32_to_cpu(lp->rx_ring[entry].msg_length) & 0xfff)-4;
struct sk_buff *skb;
- if (pkt_len < 60) {
+ /* Discard oversize frames. */
+ if (unlikely(pkt_len > PKT_BUF_SZ - 2)) {
+ if (netif_msg_drv(lp))
+ printk(KERN_ERR "%s: Impossible packet size %d!\n",
+ dev->name, pkt_len);
+ lp->stats.rx_errors++;
+ } else if (pkt_len < 60) {
if (netif_msg_rx_err(lp))
printk(KERN_ERR "%s: Runt packet!\n", dev->name);
lp->stats.rx_errors++;
--
Don Fry
brazilnut@us.ibm.com
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 1 2.4.27] pcnet32: discard oversize rx packets
2004-08-09 23:14 [PATCH 1 2.4.27] pcnet32: discard oversize rx packets Don Fry
@ 2004-09-17 15:29 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2004-09-17 15:29 UTC (permalink / raw)
To: Don Fry; +Cc: tsbogend, netdev
applied patches 1-5 to 2.4.x
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-09-17 15:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-08-09 23:14 [PATCH 1 2.4.27] pcnet32: discard oversize rx packets Don Fry
2004-09-17 15:29 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).