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

Remove pcbinfo locking from in_setsockaddr() and in_setpeeraddr();

Browse Source 
holding the inpcb lock is sufficient to prevent races in reading
the address and port, as both the inpcb lock and pcbinfo lock are
required to change the address/port.

Improve consistency of spelling in assertions about inp != NULL.

MFC after:	3 months
This commit is contained in:
rwatson 2006-04-22 19:10:02 +00:00
parent 08414eb70c
commit 2a5f091dc3
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/netinet/in_pcb.c
View File

@ -759,14 +759,13 @@ in_setsockaddr(struct socket *so, struct sockaddr **nam,
struct in_addr addr;
in_port_t port;
INP_INFO_RLOCK(pcbinfo);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("in_setsockaddr: so_pcb == NULL"));
KASSERT(inp != NULL, ("in_setsockaddr: inp == NULL"));
INP_LOCK(inp);
port = inp->inp_lport;
addr = inp->inp_laddr;
INP_UNLOCK(inp);
INP_INFO_RUNLOCK(pcbinfo);
*nam = in_sockaddr(port, &addr);
return 0;
@ -783,14 +782,13 @@ in_setpeeraddr(struct socket *so, struct sockaddr **nam,
struct in_addr addr;
in_port_t port;
INP_INFO_RLOCK(pcbinfo);
inp = sotoinpcb(so);
KASSERT(inp != NULL, ("in_setpeeraddr: so_pcb == NULL"));
KASSERT(inp != NULL, ("in_setpeeraddr: inp == NULL"));
INP_LOCK(inp);
port = inp->inp_fport;
addr = inp->inp_faddr;
INP_UNLOCK(inp);
INP_INFO_RUNLOCK(pcbinfo);
*nam = in_sockaddr(port, &addr);
return 0;