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

…/linux/kernel/git/kuba/linux Pull in Pavel's patch from a shared branch. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
mariux64 · Jul 22, 2022 · 3c47fb2 · 3c47fb2
2 parents 1b5995e + 2829a26
commit 3c47fb2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;