From owner-svn-src-all@freebsd.org  Wed Aug 19 21:08:43 2015
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 467D09BE35E;
 Wed, 19 Aug 2015 21:08:43 +0000 (UTC)
 (envelope-from melifaro@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3797A1098;
 Wed, 19 Aug 2015 21:08:43 +0000 (UTC)
 (envelope-from melifaro@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7JL8hDS041933;
 Wed, 19 Aug 2015 21:08:43 GMT (envelope-from melifaro@FreeBSD.org)
Received: (from melifaro@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7JL8hvS041932;
 Wed, 19 Aug 2015 21:08:43 GMT (envelope-from melifaro@FreeBSD.org)
Message-Id: <201508192108.t7JL8hvS041932@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: melifaro set sender to
 melifaro@FreeBSD.org using -f
From: "Alexander V. Chernikov" <melifaro@FreeBSD.org>
Date: Wed, 19 Aug 2015 21:08:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286945 - head/sys/netinet
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Aug 2015 21:08:43 -0000

Author: melifaro
Date: Wed Aug 19 21:08:42 2015
New Revision: 286945
URL: https://svnweb.freebsd.org/changeset/base/286945

Log:
  Check value return from lle_create() for NULL.
  This bug sneaked unnoticed in r286722.
  
  Reported by:	adrian

Modified:
  head/sys/netinet/if_ether.c

Modified: head/sys/netinet/if_ether.c
==============================================================================
--- head/sys/netinet/if_ether.c	Wed Aug 19 21:04:50 2015	(r286944)
+++ head/sys/netinet/if_ether.c	Wed Aug 19 21:08:42 2015	(r286945)
@@ -790,10 +790,13 @@ match:
 		 */
 		IF_AFDATA_WLOCK(ifp);
 		la = lla_create(LLTABLE(ifp), 0, (struct sockaddr *)&sin);
-		arp_update_lle(ah, ifp, la);
+		if (la != NULL)
+			arp_update_lle(ah, ifp, la);
 		IF_AFDATA_WUNLOCK(ifp);
-		arp_mark_lle_reachable(la);
-		LLE_WUNLOCK(la);
+		if (la != NULL) {
+			arp_mark_lle_reachable(la);
+			LLE_WUNLOCK(la);
+		}
 	}
 reply:
 	if (op != ARPOP_REQUEST)