diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-07-22 14:53:33 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-07-22 14:53:33 -0700 |
| commit | 3c47fb2f4c4df33881fa540e35e21415a6ecfbb5 (patch) | |
| tree | cd6ad1a793a2384453ab216d7040d11502f036c8 | |
| parent | 1b5995e370e4024e7bb7408247363e8e67f0393d (diff) | |
| parent | 2829a267fca297983b9302fa2cb833757328c857 (diff) | |
| download | linux-stable-3c47fb2f4c4df33881fa540e35e21415a6ecfbb5.tar.gz linux-stable-3c47fb2f4c4df33881fa540e35e21415a6ecfbb5.tar.bz2 linux-stable-3c47fb2f4c4df33881fa540e35e21415a6ecfbb5.zip | |
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>
| -rw-r--r-- | net/core/datagram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/datagram.c b/net/core/datagram.c index 8c702904d960..f3988ef8e9af 100644 --- 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; |