svn commit: r220821 - stable/7/sys/netinet
Bjoern A. Zeeb
bz at FreeBSD.org
Tue Apr 19 08:00:45 UTC 2011
Author: bz
Date: Tue Apr 19 08:00:44 2011
New Revision: 220821
URL: http://svn.freebsd.org/changeset/base/220821
Log:
MFC r219779:
Properly check for an IPv4 socket after r219579.
In some cases as udp6_connect() without an earlier bind(2) to an
address, v4-mapped sockets 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)
Modified:
stable/7/sys/netinet/in_pcb.c
Directory Properties:
stable/7/sys/ (props changed)
stable/7/sys/cddl/contrib/opensolaris/ (props changed)
stable/7/sys/contrib/dev/acpica/ (props changed)
stable/7/sys/contrib/pf/ (props changed)
Modified: stable/7/sys/netinet/in_pcb.c
==============================================================================
--- stable/7/sys/netinet/in_pcb.c Tue Apr 19 07:54:21 2011 (r220820)
+++ stable/7/sys/netinet/in_pcb.c Tue Apr 19 08:00:44 2011 (r220821)
@@ -332,7 +332,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;
@@ -368,7 +368,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;
More information about the svn-src-stable-7
mailing list