diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-06 21:25:44 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-11-24 04:28:48 -0500 |
commit | 6ce8e9ce5989ae13f493062975304700be86d20e (patch) | |
tree | b714f34723d37ccd90bb5350555cbfe9dc8b9abe /net/caif/caif_socket.c | |
parent | 227158db160449b6513d2e31894a135104b90e90 (diff) |
new helper: memcpy_from_msg()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'net/caif/caif_socket.c')
-rw-r--r-- | net/caif/caif_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index fbcd156099fb..230f14026c11 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c | |||
@@ -566,7 +566,7 @@ static int caif_seqpkt_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
566 | 566 | ||
567 | skb_reserve(skb, cf_sk->headroom); | 567 | skb_reserve(skb, cf_sk->headroom); |
568 | 568 | ||
569 | ret = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len); | 569 | ret = memcpy_from_msg(skb_put(skb, len), msg, len); |
570 | 570 | ||
571 | if (ret) | 571 | if (ret) |
572 | goto err; | 572 | goto err; |
@@ -641,7 +641,7 @@ static int caif_stream_sendmsg(struct kiocb *kiocb, struct socket *sock, | |||
641 | */ | 641 | */ |
642 | size = min_t(int, size, skb_tailroom(skb)); | 642 | size = min_t(int, size, skb_tailroom(skb)); |
643 | 643 | ||
644 | err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size); | 644 | err = memcpy_from_msg(skb_put(skb, size), msg, size); |
645 | if (err) { | 645 | if (err) { |
646 | kfree_skb(skb); | 646 | kfree_skb(skb); |
647 | goto out_err; | 647 | goto out_err; |