From owner-svn-src-head@freebsd.org  Wed Jul  4 16:34:08 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1B532101F031;
 Wed,  4 Jul 2018 16:34:08 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id A92A485897;
 Wed,  4 Jul 2018 16:34:07 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 84CEC5A96;
 Wed,  4 Jul 2018 16:34:07 +0000 (UTC)
 (envelope-from mmacy@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w64GY7Yp002038;
 Wed, 4 Jul 2018 16:34:07 GMT (envelope-from mmacy@FreeBSD.org)
Received: (from mmacy@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w64GY7YP002037;
 Wed, 4 Jul 2018 16:34:07 GMT (envelope-from mmacy@FreeBSD.org)
Message-Id: <201807041634.w64GY7YP002037@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mmacy set sender to
 mmacy@FreeBSD.org using -f
From: Matt Macy <mmacy@FreeBSD.org>
Date: Wed, 4 Jul 2018 16:34:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r335958 - head/sys/netinet6
X-SVN-Group: head
X-SVN-Commit-Author: mmacy
X-SVN-Commit-Paths: head/sys/netinet6
X-SVN-Commit-Revision: 335958
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jul 2018 16:34:08 -0000

Author: mmacy
Date: Wed Jul  4 16:34:07 2018
New Revision: 335958
URL: https://svnweb.freebsd.org/changeset/base/335958

Log:
  fix 335919 - check "last" not "inp" where appropriate
  
  Submitted by:	ae
  Reported by:	cy

Modified:
  head/sys/netinet6/udp6_usrreq.c

Modified: head/sys/netinet6/udp6_usrreq.c
==============================================================================
--- head/sys/netinet6/udp6_usrreq.c	Wed Jul  4 14:25:38 2018	(r335957)
+++ head/sys/netinet6/udp6_usrreq.c	Wed Jul  4 16:34:07 2018	(r335958)
@@ -387,7 +387,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 				if ((n = m_copym(m, 0, M_COPYALL, M_NOWAIT)) !=
 				    NULL) {
 					INP_RLOCK(last);
-					if (__predict_true(inp->inp_flags2 & INP_FREED) == 0) {
+					if (__predict_true(last->inp_flags2 & INP_FREED) == 0) {
 						UDP_PROBE(receive, NULL, last, ip6,
 					        last, uh);
 						if (udp6_append(last, n, off, fromsa))
@@ -421,7 +421,7 @@ udp6_input(struct mbuf **mp, int *offp, int proto)
 			goto badheadlocked;
 		}
 		INP_RLOCK(last);
-		if (__predict_true(inp->inp_flags2 & INP_FREED) == 0) {
+		if (__predict_true(last->inp_flags2 & INP_FREED) == 0) {
 			UDP_PROBE(receive, NULL, last, ip6, last, uh);
 			if (udp6_append(last, m, off, fromsa) == 0)
 				INP_RUNLOCK(last);