new helper: memcpy_from_msg()

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 3 insertions, 3 deletions

diff --git a/net/nfc/llcp_commands.c b/net/nfc/llcp_commands.c
index a3ad69a4c648..c4da0c2d8a14 100644
--- a/net/nfc/llcp_commands.c
+++ b/net/nfc/llcp_commands.c
@@ -665,7 +665,7 @@ int nfc_llcp_send_i_frame(struct nfc_llcp_sock *sock,
         if (msg_data == NULL)
                 return -ENOMEM;
 
-        if (memcpy_fromiovec(msg_data, msg->msg_iov, len)) {
+        if (memcpy_from_msg(msg_data, msg, len)) {
                 kfree(msg_data);
                 return -EFAULT;
         }
@@ -731,7 +731,7 @@ int nfc_llcp_send_ui_frame(struct nfc_llcp_sock *sock, u8 ssap, u8 dsap,
         if (msg_data == NULL)
                 return -ENOMEM;
 
-        if (memcpy_fromiovec(msg_data, msg->msg_iov, len)) {
+        if (memcpy_from_msg(msg_data, msg, len)) {
                 kfree(msg_data);
                 return -EFAULT;
         }
diff --git a/net/nfc/rawsock.c b/net/nfc/rawsock.c
index 9d7d2b7ba5e4..373e138c0ab6 100644
--- a/net/nfc/rawsock.c
+++ b/net/nfc/rawsock.c
@@ -231,7 +231,7 @@ static int rawsock_sendmsg(struct kiocb *iocb, struct socket *sock,
         if (skb == NULL)
                 return rc;
 
-        rc = memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len);
+        rc = memcpy_from_msg(skb_put(skb, len), msg, len);
         if (rc < 0) {
                 kfree_skb(skb);
                 return rc;