diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-11 08:54:22 -0500 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-01-11 08:56:32 -0500 |
commit | fb97c3e80f99988079df4fb5f3c84aea4e7f806a (patch) | |
tree | 71bcd079de22210d37f2dcdc8bf7ebdf84e4ac57 | |
parent | fad2e371bb5a9f64dced90309fa7cb8bce09e92f (diff) |
NFC: Use skb_copy_datagram_iovec
Safer and more robust than than memcpy_toiovec.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | net/nfc/llcp/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/nfc/llcp/sock.c b/net/nfc/llcp/sock.c index 463231bed8d4..5332751943a9 100644 --- a/net/nfc/llcp/sock.c +++ b/net/nfc/llcp/sock.c | |||
@@ -672,7 +672,7 @@ static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock, | |||
672 | copied = min_t(unsigned int, rlen, len); | 672 | copied = min_t(unsigned int, rlen, len); |
673 | 673 | ||
674 | cskb = skb; | 674 | cskb = skb; |
675 | if (memcpy_toiovec(msg->msg_iov, cskb->data, copied)) { | 675 | if (skb_copy_datagram_iovec(cskb, 0, msg->msg_iov, copied)) { |
676 | if (!(flags & MSG_PEEK)) | 676 | if (!(flags & MSG_PEEK)) |
677 | skb_queue_head(&sk->sk_receive_queue, skb); | 677 | skb_queue_head(&sk->sk_receive_queue, skb); |
678 | return -EFAULT; | 678 | return -EFAULT; |