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

Commit 0b62fca2 authored by Al Viro's avatar Al Viro
Browse files

switch getfrag callbacks to ..._full() primitives 



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

include/net/udplite.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static __inline__ int udplite_getfrag(void *from, char *to, int offset, 
				      int len, int odd, struct sk_buff *skb)

{

	struct msghdr *msg = from;

	return copy_from_iter(to, len, &msg->msg_iter) != len ? -EFAULT : 0;

	return copy_from_iter_full(to, len, &msg->msg_iter) ? 0 : -EFAULT;

}



/* Designate sk as UDP-Lite socket */

net/ipv4/ip_output.c

+2 −2
Original line number Diff line number Diff line
@@ -802,11 +802,11 @@ ip_generic_getfrag(void *from, char *to, int offset, int len, int odd, struct sk 
	struct msghdr *msg = from;



	if (skb->ip_summed == CHECKSUM_PARTIAL) {

		if (copy_from_iter(to, len, &msg->msg_iter) != len)

		if (!copy_from_iter_full(to, len, &msg->msg_iter))

			return -EFAULT;

	} else {

		__wsum csum = 0;

		if (csum_and_copy_from_iter(to, len, &csum, &msg->msg_iter) != len)

		if (!csum_and_copy_from_iter_full(to, len, &csum, &msg->msg_iter))

			return -EFAULT;

		skb->csum = csum_block_add(skb->csum, csum, odd);

	}

net/ipv4/ping.c

+4 −4
Original line number Diff line number Diff line
@@ -609,15 +609,15 @@ int ping_getfrag(void *from, char *to, 
		fraglen -= sizeof(struct icmphdr);

		if (fraglen < 0)

			BUG();

		if (csum_and_copy_from_iter(to + sizeof(struct icmphdr),

		if (!csum_and_copy_from_iter_full(to + sizeof(struct icmphdr),

			    fraglen, &pfh->wcheck,

			    &pfh->msg->msg_iter) != fraglen)

			    &pfh->msg->msg_iter))

			return -EFAULT;

	} else if (offset < sizeof(struct icmphdr)) {

			BUG();

	} else {

		if (csum_and_copy_from_iter(to, fraglen, &pfh->wcheck,

					    &pfh->msg->msg_iter) != fraglen)

		if (!csum_and_copy_from_iter_full(to, fraglen, &pfh->wcheck,

					    &pfh->msg->msg_iter))

			return -EFAULT;

	}