Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[thirdparty/kernel/stable.git] / include / linux / skbuff.h

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 81ef53f0653494f09e5e8470bdb3e0eed2ec3b28..a098d95b3d84d0246adc88651af9978d6810fb01 100644 (file)
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -3116,7 +3116,7 @@ struct sk_buff *pskb_extract(struct sk_buff *skb, int off, int to_copy,
 
 static inline int memcpy_from_msg(void *data, struct msghdr *msg, int len)
 {
-       return copy_from_iter(data, len, &msg->msg_iter) == len ? 0 : -EFAULT;
+       return copy_from_iter_full(data, len, &msg->msg_iter) ? 0 : -EFAULT;
 }
 
 static inline int memcpy_to_msg(struct msghdr *msg, void *data, int len)