From owner-svn-src-head@FreeBSD.ORG  Sat Mar 19 19:08:54 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 61CB3106566B;
	Sat, 19 Mar 2011 19:08:54 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 593988FC0A;
	Sat, 19 Mar 2011 19:08:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2JJ8s8h032276;
	Sat, 19 Mar 2011 19:08:54 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2JJ8sk2032274;
	Sat, 19 Mar 2011 19:08:54 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201103191908.p2JJ8sk2032274@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 19 Mar 2011 19:08:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219779 - head/sys/netinet
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Mar 2011 19:08:54 -0000

Author: bz
Date: Sat Mar 19 19:08:54 2011
New Revision: 219779
URL: http://svn.freebsd.org/changeset/base/219779

Log:
  Properly check for an IPv4 socket after r219579.
  
  In some cases as udp6_connect() without an earlier bind(2) to an
  address, v4-mapped scokets allowed and a non mapped destination
  address, we can end up here with both v4 and v6 indicated:
  	inp_vflag = (INP_IPV4|INP_IPV6|INP_IPV6PROTO)
  
  In that case however laddrp is NULL as the IPv6 path does not
  pass in a copy currently.
  
  Reported by:	Pawel Worach (pawel.worach gmail.com)
  Tested by:	Pawel Worach (pawel.worach gmail.com)
  MFC after:	6 days
  X-MFC with:	r219579

Modified:
  head/sys/netinet/in_pcb.c

Modified: head/sys/netinet/in_pcb.c
==============================================================================
--- head/sys/netinet/in_pcb.c	Sat Mar 19 18:26:54 2011	(r219778)
+++ head/sys/netinet/in_pcb.c	Sat Mar 19 19:08:54 2011	(r219779)
@@ -387,7 +387,7 @@ in_pcb_lport(struct inpcb *inp, struct i
 #ifdef INET
 	/* Make the compiler happy. */
 	laddr.s_addr = 0;
-	if ((inp->inp_vflag & INP_IPV4) != 0) {
+	if ((inp->inp_vflag & (INP_IPV4|INP_IPV6)) == INP_IPV4) {
 		KASSERT(laddrp != NULL, ("%s: laddrp NULL for v4 inp %p",
 		    __func__, inp));
 		laddr = *laddrp;
@@ -423,7 +423,7 @@ in_pcb_lport(struct inpcb *inp, struct i
 	} while (tmpinp != NULL);
 
 #ifdef INET
-	if ((inp->inp_vflag & INP_IPV4) != 0)
+	if ((inp->inp_vflag & (INP_IPV4|INP_IPV6)) == INP_IPV4)
 		laddrp->s_addr = laddr.s_addr;
 #endif                 
 	*lportp = lport;