new helper: memcpy_from_msg()

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

4 files changed, 4 insertions, 4 deletions

diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index 5e2cd2535978..2c245fdf319a 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -947,7 +947,7 @@ static int hci_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 drop;
         }
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index cbeef5f62f3b..f3e4a16fb157 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -5767,7 +5767,7 @@ int mgmt_control(struct sock *sk, struct msghdr *msg, size_t msglen)
         if (!buf)
                 return -ENOMEM;
 
-        if (memcpy_fromiovec(buf, msg->msg_iov, msglen)) {
+        if (memcpy_from_msg(buf, msg, msglen)) {
                 err = -EFAULT;
                 goto done;
         }
diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
index 8bbbb5ec468c..2348176401a0 100644
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
@@ -588,7 +588,7 @@ static int rfcomm_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
                 }
                 skb_reserve(skb, RFCOMM_SKB_HEAD_RESERVE);
 
-                err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
+                err = memcpy_from_msg(skb_put(skb, size), msg, size);
                 if (err) {
                         kfree_skb(skb);
                         if (sent == 0)
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 7ee9e4ab00f8..30e5ea3f1ad3 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -285,7 +285,7 @@ static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
         if (!skb)
                 return err;
 
-        if (memcpy_fromiovec(skb_put(skb, len), msg->msg_iov, len)) {
+        if (memcpy_from_msg(skb_put(skb, len), msg, len)) {
                 kfree_skb(skb);
                 return -EFAULT;
         }