Merge tag 'net-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

[platform/kernel/linux-starfive.git] / net / core / skmsg.c

diff --git a/net/core/skmsg.c b/net/core/skmsg.c
index 57e942a..f47338d 100644 (file)
--- a/net/core/skmsg.c
+++ b/net/core/skmsg.c
@@ -324,14 +324,13 @@ int sk_msg_zerocopy_from_iter(struct sock *sk, struct iov_iter *from,
                        goto out;
                }
 
-               copied = iov_iter_get_pages(from, pages, bytes, maxpages,
+               copied = iov_iter_get_pages2(from, pages, bytes, maxpages,
                                            &offset);
                if (copied <= 0) {
                        ret = -EFAULT;
                        goto out;
                }
 
-               iov_iter_advance(from, copied);
                bytes -= copied;
                msg->sg.size += copied;