---

yaml --- r: 351916 b: refs/heads/master c: fb97c3e h: refs/heads/master v: v3
git-mirror · Jan 11, 2013 · 7b45166 · 7b45166
1 parent b998a73
commit 7b45166
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fad2e371bb5a9f64dced90309fa7cb8bce09e92f
+refs/heads/master: fb97c3e80f99988079df4fb5f3c84aea4e7f806a
diff --git a/trunk/net/nfc/llcp/sock.c b/trunk/net/nfc/llcp/sock.c
@@ -672,7 +672,7 @@ static int llcp_sock_recvmsg(struct kiocb *iocb, struct socket *sock,
 	copied = min_t(unsigned int, rlen, len);
 
 	cskb = skb;
-	if (memcpy_toiovec(msg->msg_iov, cskb->data, copied)) {
+	if (skb_copy_datagram_iovec(cskb, 0, msg->msg_iov, copied)) {
 		if (!(flags & MSG_PEEK))
 			skb_queue_head(&sk->sk_receive_queue, skb);
 		return -EFAULT;