diff options
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 749f80c21e22..e96884380732 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -1492,10 +1492,14 @@ static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,  	if (len > sk->sk_sndbuf - 32)  		goto out; -	if (len > SKB_MAX_ALLOC) +	if (len > SKB_MAX_ALLOC) {  		data_len = min_t(size_t,  				 len - SKB_MAX_ALLOC,  				 MAX_SKB_FRAGS * PAGE_SIZE); +		data_len = PAGE_ALIGN(data_len); + +		BUILD_BUG_ON(SKB_MAX_ALLOC < PAGE_SIZE); +	}  	skb = sock_alloc_send_pskb(sk, len - data_len, data_len,  				   msg->msg_flags & MSG_DONTWAIT, &err, @@ -1670,6 +1674,8 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,  		data_len = max_t(int, 0, size - SKB_MAX_HEAD(0)); +		data_len = min_t(size_t, size, PAGE_ALIGN(data_len)); +  		skb = sock_alloc_send_pskb(sk, size - data_len, data_len,  					   msg->msg_flags & MSG_DONTWAIT, &err,  					   get_order(UNIX_SKB_FRAGS_SZ));  | 
