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

Commit 7eab8d9e authored by Al Viro's avatar Al Viro
Browse files

new helper: memcpy_to_msg() 



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

crypto/algif_hash.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock, 
			goto unlock;

	}



	err = memcpy_toiovec(msg->msg_iov, ctx->result, len);

	err = memcpy_to_msg(msg, ctx->result, len);



unlock:

	release_sock(sk);

include/linux/skbuff.h

+5 −0
Original line number Diff line number Diff line
@@ -2692,6 +2692,11 @@ static inline int memcpy_from_msg(void *data, struct msghdr *msg, int len) 
	return memcpy_fromiovec(data, msg->msg_iov, len);

}



static inline int memcpy_to_msg(struct msghdr *msg, void *data, int len)

{

	return memcpy_toiovec(msg->msg_iov, data, len);

}



struct skb_checksum_ops {

	__wsum (*update)(const void *mem, int len, __wsum wsum);

	__wsum (*combine)(__wsum csum, __wsum csum2, int offset, int len);

net/caif/caif_socket.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ static int caif_stream_recvmsg(struct kiocb *iocb, struct socket *sock, 
		}

		release_sock(sk);

		chunk = min_t(unsigned int, skb->len, size);

		if (memcpy_toiovec(msg->msg_iov, skb->data, chunk)) {

		if (memcpy_to_msg(msg, skb->data, chunk)) {

			skb_queue_head(&sk->sk_receive_queue, skb);

			if (copied == 0)

				copied = -EFAULT;

net/can/bcm.c

+1 −1
Original line number Diff line number Diff line
@@ -1555,7 +1555,7 @@ static int bcm_recvmsg(struct kiocb *iocb, struct socket *sock, 
	if (skb->len < size)

		size = skb->len;



	err = memcpy_toiovec(msg->msg_iov, skb->data, size);

	err = memcpy_to_msg(msg, skb->data, size);

	if (err < 0) {

		skb_free_datagram(sk, skb);

		return err;

net/can/raw.c

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ static int raw_recvmsg(struct kiocb *iocb, struct socket *sock, 
	else

		size = skb->len;



	err = memcpy_toiovec(msg->msg_iov, skb->data, size);

	err = memcpy_to_msg(msg, skb->data, size);

	if (err < 0) {

		skb_free_datagram(sk, skb);

		return err;