From owner-freebsd-bugs  Sat Apr  8 21:43: 4 2000
Delivered-To: freebsd-bugs@freebsd.org
Received: from dustdevil.waterspout.com (dustdevil.waterspout.com [208.13.60.151])
	by hub.freebsd.org (Postfix) with ESMTP
	id 8563037B530; Sat,  8 Apr 2000 21:43:01 -0700 (PDT)
	(envelope-from csg@waterspout.com)
Received: from waterspout.com (csg@localhost [127.0.0.1])
	by dustdevil.waterspout.com (8.9.3/8.9.3) with ESMTP id XAA16277;
	Sat, 8 Apr 2000 23:48:13 -0500 (EST)
	(envelope-from csg@waterspout.com)
Message-Id: <200004090448.XAA16277@dustdevil.waterspout.com>
To: freebsd-bugs@FreeBSD.org
Cc: wes@FreeBSD.org
Subject: Re: kern/17872: arpintr() fix followup 
In-Reply-To: Your message of "Sat, 08 Apr 2000 20:30:01 MST."
             <200004090330.UAA11911@freefall.freebsd.org> 
From: csg@waterspout.com (C. Stephen Gunn)
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <16234.955255692.1@waterspout.com>
Date: Sat, 08 Apr 2000 23:48:12 -0500
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

Sorry for the broken patch before.  This one should work much better:

It's relative to 4.0-STABLE from today.

Index: if_ether.c
===================================================================
RCS file: /project/cvs/FreeBSD/src/sys/netinet/if_ether.c,v
retrieving revision 1.64.2.2
diff -u -b -r1.64.2.2 if_ether.c
--- if_ether.c	2000/03/29 07:52:50	1.64.2.2
+++ if_ether.c	2000/04/09 04:22:28
@@ -430,9 +430,9 @@
 static void
 arpintr()
 {
-	register struct mbuf *m, *m0;
+	register struct mbuf *m;
 	register struct arphdr *ar;
-	int s, ml;
+	int s;
 
 	while (arpintrq.ifq_head) {
 		s = splimp();
@@ -457,14 +457,7 @@
 			continue;
 		}
 
-		m0 = m;
-		ml = 0;
-		while (m0 != NULL) {	
-			ml += m0->m_len;	/* wanna implement m_size?? */
-			m0 = m0->m_next;	
-		}
-
-		if (ml < sizeof(struct arphdr) + 2 * ar->ar_hln
+		if (m->m_pkthdr.len < sizeof(struct arphdr) + 2 * ar->ar_hln
 		    + 2 * ar->ar_pln) {
 			log(LOG_ERR, "arp: runt packet\n");
 			m_freem(m);


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message