d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

The connect() system call should return -1 and set errno to EAFNOSUPPORT

Browse Source 
if it is called on a TCP socket
 * with an IPv6 address and the socket is bound to an
    IPv4-mapped IPv6 address.
 * with an IPv4-mapped IPv6 address and the socket is bound to an
   IPv6 address.
Thanks to Jonathan T. Leighton for reporting this issue.

Reviewed by:		bz gnn
MFC after:		3 days
Differential Revision:	https://reviews.freebsd.org/D9163
This commit is contained in:
Michael Tuexen 2017-05-22 15:29:10 +00:00
parent 9b8d05b8ac
commit 5dba6ada91
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/netinet/tcp_usrreq.c
View File

@ -597,6 +597,10 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
error = EINVAL; error = EINVAL;
goto out; goto out;
} }
if ((inp->inp_vflag & INP_IPV4) == 0) {
error = EAFNOSUPPORT;
goto out;
}
in6_sin6_2_sin(&sin, sin6p); in6_sin6_2_sin(&sin, sin6p);
inp->inp_vflag |= INP_IPV4; inp->inp_vflag |= INP_IPV4;
@ -614,6 +618,11 @@ tcp6_usr_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
#endif #endif
error = tp->t_fb->tfb_tcp_output(tp); error = tp->t_fb->tfb_tcp_output(tp);
goto out; goto out;
} else {
if ((inp->inp_vflag & INP_IPV6) == 0) {
error = EAFNOSUPPORT;
goto out;
}
} }
#endif #endif
inp->inp_vflag &= ~INP_IPV4; inp->inp_vflag &= ~INP_IPV4;

9
sys/netinet6/udp6_usrreq.c
View File

@ -1119,6 +1119,10 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
error = EINVAL; error = EINVAL;
goto out; goto out;
} }
if ((inp->inp_vflag & INP_IPV4) == 0) {
error = EAFNOSUPPORT;
goto out;
}
if (inp->inp_faddr.s_addr != INADDR_ANY) { if (inp->inp_faddr.s_addr != INADDR_ANY) {
error = EISCONN; error = EISCONN;
goto out; goto out;
@ -1136,6 +1140,11 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
if (error == 0) if (error == 0)
soisconnected(so); soisconnected(so);
goto out; goto out;
} else {
if ((inp->inp_vflag & INP_IPV6) == 0) {
error = EAFNOSUPPORT;
goto out;
}
} }
#endif #endif
if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) { if (!IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) {