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

Enter network epoch when calling in_pcbconnect() for IPv6 mapped to IPv4

Browse Source 
UDP sockets.  This is miss from r356983.

Reported by:	https://syzkaller.appspot.com/bug?id=73c7a2e3f0783f9947459065e5c2f25fe8f82f54
This commit is contained in:
Gleb Smirnoff 2020-01-22 17:06:55 +00:00
parent 7754e281c0
commit e617b21d2f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/netinet6/udp6_usrreq.c
View File

@ -1177,6 +1177,7 @@ udp6_close(struct socket *so)
static int static int
udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td) udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
{ {
struct epoch_tracker et;
struct inpcb *inp; struct inpcb *inp;
struct inpcbinfo *pcbinfo; struct inpcbinfo *pcbinfo;
struct sockaddr_in6 *sin6; struct sockaddr_in6 *sin6;
@ -1215,10 +1216,12 @@ udp6_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
vflagsav = inp->inp_vflag; vflagsav = inp->inp_vflag;
inp->inp_vflag |= INP_IPV4; inp->inp_vflag |= INP_IPV4;
inp->inp_vflag &= ~INP_IPV6; inp->inp_vflag &= ~INP_IPV6;
NET_EPOCH_ENTER(et);
INP_HASH_WLOCK(pcbinfo); INP_HASH_WLOCK(pcbinfo);
error = in_pcbconnect(inp, (struct sockaddr *)&sin, error = in_pcbconnect(inp, (struct sockaddr *)&sin,
td->td_ucred); td->td_ucred);
INP_HASH_WUNLOCK(pcbinfo); INP_HASH_WUNLOCK(pcbinfo);
NET_EPOCH_EXIT(et);
/* /*
* If connect succeeds, mark socket as connected. If * If connect succeeds, mark socket as connected. If
* connect fails and socket is unbound, reset inp_vflag * connect fails and socket is unbound, reset inp_vflag