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

Commit 6ce8e9ce authored by Al Viro's avatar Al Viro
Browse files

new helper: memcpy_from_msg() 



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

crypto/algif_skcipher.c

+5 −5
Original line number Diff line number Diff line
@@ -298,9 +298,9 @@ static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock, 
			len = min_t(unsigned long, len,

				    PAGE_SIZE - sg->offset - sg->length);



			err = memcpy_fromiovec(page_address(sg_page(sg)) +

			err = memcpy_from_msg(page_address(sg_page(sg)) +

					      sg->offset + sg->length,

					       msg->msg_iov, len);

					      msg, len);

			if (err)

				goto unlock;
@@ -337,8 +337,8 @@ static int skcipher_sendmsg(struct kiocb *unused, struct socket *sock, 
			if (!sg_page(sg + i))

				goto unlock;



			err = memcpy_fromiovec(page_address(sg_page(sg + i)),

					       msg->msg_iov, plen);

			err = memcpy_from_msg(page_address(sg_page(sg + i)),

					      msg, plen);

			if (err) {

				__free_page(sg_page(sg + i));

				sg_assign_page(sg + i, NULL);

drivers/isdn/mISDN/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 
	if (!skb)

		goto done;



	if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {

	if (memcpy_from_msg(skb_put(skb, len), msg, len)) {

		err = -EFAULT;

		goto done;

	}

drivers/net/ppp/pppoe.c

+1 −1
Original line number Diff line number Diff line
@@ -869,7 +869,7 @@ static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, 
	ph = (struct pppoe_hdr *)skb_put(skb, total_len + sizeof(struct pppoe_hdr));

	start = (char *)&ph->tag[0];



	error = memcpy_fromiovec(start, m->msg_iov, total_len);

	error = memcpy_from_msg(start, m, total_len);

	if (error < 0) {

		kfree_skb(skb);

		goto end;

include/linux/skbuff.h

+5 −0
Original line number Diff line number Diff line
@@ -2687,6 +2687,11 @@ int skb_ensure_writable(struct sk_buff *skb, int write_len); 
int skb_vlan_pop(struct sk_buff *skb);

int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci);



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

{

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

}



struct skb_checksum_ops {

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

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

include/net/sctp/sm.h

+1 −1
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ struct sctp_chunk *sctp_make_abort_no_data(const struct sctp_association *, 
				      const struct sctp_chunk *,

				      __u32 tsn);

struct sctp_chunk *sctp_make_abort_user(const struct sctp_association *,

					const struct msghdr *, size_t msg_len);

					struct msghdr *, size_t msg_len);

struct sctp_chunk *sctp_make_abort_violation(const struct sctp_association *,

				   const struct sctp_chunk *,

				   const __u8 *,