Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Apr 2013 07:00:32 +0000 (UTC)
From:      Gleb Smirnoff <glebius@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r249975 - stable/9/sys/netinet
Message-ID:  <201304270700.r3R70WWu060251@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: glebius
Date: Sat Apr 27 07:00:31 2013
New Revision: 249975
URL: http://svnweb.freebsd.org/changeset/base/249975

Log:
  Merge r249903 from head:
    Fix couple of mbuf leaks in incoming ARP processing.

Modified:
  stable/9/sys/netinet/if_ether.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/if_ether.c
==============================================================================
--- stable/9/sys/netinet/if_ether.c	Sat Apr 27 06:57:39 2013	(r249974)
+++ stable/9/sys/netinet/if_ether.c	Sat Apr 27 07:00:31 2013	(r249975)
@@ -543,13 +543,13 @@ in_arpinput(struct mbuf *m)
 	if (ah->ar_pln != sizeof(struct in_addr)) {
 		log(LOG_NOTICE, "in_arp: requested protocol length != %zu\n",
 		    sizeof(struct in_addr));
-		return;
+		goto drop;
 	}
 
 	if (allow_multicast == 0 && ETHER_IS_MULTICAST(ar_sha(ah))) {
 		log(LOG_NOTICE, "arp: %*D is multicast\n",
 		    ifp->if_addrlen, (u_char *)ar_sha(ah), ":");
-		return;
+		goto drop;
 	}
 
 	op = ntohs(ah->ar_op);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304270700.r3R70WWu060251>