Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 227158db authored by Al Viro's avatar Al Viro
Browse files

new helper: skb_copy_and_csum_datagram_msg() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent c33d23c2

include/linux/skbuff.h

+5 −0
Original line number Diff line number Diff line
@@ -2651,6 +2651,11 @@ static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset, 
}

int skb_copy_and_csum_datagram_iovec(struct sk_buff *skb, int hlen,

				     struct iovec *iov);

static inline int skb_copy_and_csum_datagram_msg(struct sk_buff *skb, int hlen,

			    struct msghdr *msg)

{

	return skb_copy_and_csum_datagram_iovec(skb, hlen, msg->msg_iov);

}

int skb_copy_datagram_from_iovec(struct sk_buff *skb, int offset,

				 const struct iovec *from, int from_offset,

				 int len);

net/ipv4/udp.c

+2 −3
Original line number Diff line number Diff line
@@ -1284,9 +1284,8 @@ int udp_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		err = skb_copy_datagram_msg(skb, sizeof(struct udphdr),

					    msg, copied);

	else {

		err = skb_copy_and_csum_datagram_iovec(skb,

						       sizeof(struct udphdr),

						       msg->msg_iov);

		err = skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr),

						     msg);



		if (err == -EINVAL)

			goto csum_copy_err;

net/ipv6/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -492,7 +492,7 @@ static int rawv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
			goto csum_copy_err;

		err = skb_copy_datagram_msg(skb, 0, msg, copied);

	} else {

		err = skb_copy_and_csum_datagram_iovec(skb, 0, msg->msg_iov);

		err = skb_copy_and_csum_datagram_msg(skb, 0, msg);

		if (err == -EINVAL)

			goto csum_copy_err;

	}

net/ipv6/udp.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ int udpv6_recvmsg(struct kiocb *iocb, struct sock *sk, 
		err = skb_copy_datagram_msg(skb, sizeof(struct udphdr),

					    msg, copied);

	else {

		err = skb_copy_and_csum_datagram_iovec(skb, sizeof(struct udphdr), msg->msg_iov);

		err = skb_copy_and_csum_datagram_msg(skb, sizeof(struct udphdr), msg);

		if (err == -EINVAL)

			goto csum_copy_err;

	}