From: Don Fry <brazilnut@us.ibm.com>
To: tsbogend@alpha.franken.de, jgarzik@pobox.com, netdev@oss.sgi.com
Subject: [PATCH 1 2.4.27] pcnet32: discard oversize rx packets
Date: Mon, 9 Aug 2004 16:14:44 -0700 [thread overview]
Message-ID: <20040809231444.GB13717@us.ibm.com> (raw)
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
next reply other threads:[~2004-08-09 23:14 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-08-09 23:14 Don Fry [this message]
2004-09-17 15:29 ` [PATCH 1 2.4.27] pcnet32: discard oversize rx packets Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040809231444.GB13717@us.ibm.com \
--to=brazilnut@us.ibm.com \
--cc=jgarzik@pobox.com \
--cc=netdev@oss.sgi.com \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).