net: Add and use skb_copy_datagram_msg() helper.
This encapsulates all of the skb_copy_datagram_iovec() callers with call argument signature "skb, offset, msghdr->msg_iov, length". When we move to iov_iters in the networking, the iov_iter object will sit in the msghdr. Having a helper like this means there will be less places to touch during that transformation. Based upon descriptions and patch from Al Viro. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -832,7 +832,7 @@ static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||
copied = min_t(unsigned int, rlen, len);
|
||||
|
||||
cskb = skb;
|
||||
if (skb_copy_datagram_iovec(cskb, 0, msg->msg_iov, copied)) {
|
||||
if (skb_copy_datagram_msg(cskb, 0, msg, copied)) {
|
||||
if (!(flags & MSG_PEEK))
|
||||
skb_queue_head(&sk->sk_receive_queue, skb);
|
||||
return -EFAULT;
|
||||
|
@@ -269,7 +269,7 @@ static int rawsock_recvmsg(struct kiocb *iocb, struct socket *sock,
|
||||
copied = len;
|
||||
}
|
||||
|
||||
rc = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
|
||||
rc = skb_copy_datagram_msg(skb, 0, msg, copied);
|
||||
|
||||
skb_free_datagram(sk, skb);
|
||||
|
||||
|
Reference in New Issue
Block a user