diff options
| author | bz <bz@FreeBSD.org> | 2011-03-12 16:45:15 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-03-12 16:45:15 +0000 |
| commit | 5d37412b23a8bef61f5bd22635be9554076ef5ed (patch) | |
| tree | 369bf9f83a69159dcfa0346685c2b6c89c1b49e3 | |
| parent | e3ccdf9a91cfbd4bd32ac050106dbaa9e22c3fe3 (diff) | |
| download | FreeBSD-src-5d37412b23a8bef61f5bd22635be9554076ef5ed.zip FreeBSD-src-5d37412b23a8bef61f5bd22635be9554076ef5ed.tar.gz | |
Push a possible "unbind" in some situation from in6_pcbsetport() to
callers. This also fixes a problem when the prison call could set
the inp->in6p_laddr (laddr) and a following priv_check_cred() call
would return an error and will allow us to merge the IPv4 and IPv6
implementation.
MFC after: 2 weeks
| -rw-r--r-- | sys/netinet6/in6_pcb.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/in6_src.c | 5 | ||||
| -rw-r--r-- | sys/netinet6/udp6_usrreq.c | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/sys/netinet6/in6_pcb.c b/sys/netinet6/in6_pcb.c index 6699ced..b68feb2 100644 --- a/sys/netinet6/in6_pcb.c +++ b/sys/netinet6/in6_pcb.c @@ -256,8 +256,11 @@ in6_pcbbind(register struct inpcb *inp, struct sockaddr *nam, inp->in6p_laddr = sin6->sin6_addr; } if (lport == 0) { - if ((error = in6_pcbsetport(&inp->in6p_laddr, inp, cred)) != 0) + if ((error = in6_pcbsetport(&inp->in6p_laddr, inp, cred)) != 0) { + /* Undo an address bind that may have occurred. */ + inp->in6p_laddr = in6addr_any; return (error); + } } else { inp->inp_lport = lport; if (in_pcbinshash(inp) != 0) { diff --git a/sys/netinet6/in6_src.c b/sys/netinet6/in6_src.c index 49bc715..2bf99fe 100644 --- a/sys/netinet6/in6_src.c +++ b/sys/netinet6/in6_src.c @@ -925,11 +925,8 @@ in6_pcbsetport(struct in6_addr *laddr, struct inpcb *inp, struct ucred *cred) count = last - first; do { - if (count-- < 0) { /* completely used? */ - /* Undo an address bind that may have occurred. */ - inp->in6p_laddr = in6addr_any; + if (count-- < 0) /* completely used? */ return (EADDRNOTAVAIL); - } ++*lastport; if (*lastport < first || *lastport > last) *lastport = first; diff --git a/sys/netinet6/udp6_usrreq.c b/sys/netinet6/udp6_usrreq.c index 65e6f56..422a9c9 100644 --- a/sys/netinet6/udp6_usrreq.c +++ b/sys/netinet6/udp6_usrreq.c @@ -656,8 +656,11 @@ udp6_output(struct inpcb *inp, struct mbuf *m, struct sockaddr *addr6, goto release; } if (inp->inp_lport == 0 && - (error = in6_pcbsetport(laddr, inp, td->td_ucred)) != 0) + (error = in6_pcbsetport(laddr, inp, td->td_ucred)) != 0) { + /* Undo an address bind that may have occurred. */ + inp->in6p_laddr = in6addr_any; goto release; + } } else { if (IN6_IS_ADDR_UNSPECIFIED(&inp->in6p_faddr)) { error = ENOTCONN; |
