Merge branch 'io_uring-zerocopy-send' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / net / core / datagram.c

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 8c70290..f3988ef 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -616,7 +616,7 @@ int __zerocopy_sg_from_iter(struct msghdr *msg, struct sock *sk,
 {
        int frag;
 
-       if (msg && msg->sg_from_iter)
+       if (msg && msg->msg_ubuf && msg->sg_from_iter)
                return msg->sg_from_iter(sk, skb, from, length);
 
        frag = skb_shinfo(skb)->nr_frags;