diff options
| author | peter <peter@FreeBSD.org> | 2014-08-03 22:37:21 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2014-08-03 22:37:21 +0000 |
| commit | f53e346683f0398ed0ec1a3a014c5e798c3f92d9 (patch) | |
| tree | c6040c81ff0e96fbc6eb71e06ff1abc345335a32 | |
| parent | 1d423503b17474fc76b7a45ecccda6e9ee9943b9 (diff) | |
| download | FreeBSD-src-f53e346683f0398ed0ec1a3a014c5e798c3f92d9.zip FreeBSD-src-f53e346683f0398ed0ec1a3a014c5e798c3f92d9.tar.gz | |
Partial revert of r262867.
r262867 was described as fixing socket buffer checks for SOCK_SEQPACKET,
but also changed one of the SOCK_DGRAM code paths to use the new
sbappendaddr_nospacecheck_locked() function. This lead to SOCK_DGRAM
bypassing socket buffer limits.
| -rw-r--r-- | sys/kern/uipc_usrreq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c index 4ef2e68..11b27d9 100644 --- a/sys/kern/uipc_usrreq.c +++ b/sys/kern/uipc_usrreq.c @@ -897,7 +897,7 @@ uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, from = &sun_noname; so2 = unp2->unp_socket; SOCKBUF_LOCK(&so2->so_rcv); - if (sbappendaddr_nospacecheck_locked(&so2->so_rcv, from, m, + if (sbappendaddr_locked(&so2->so_rcv, from, m, control)) { sorwakeup_locked(so2); m = NULL; |
