]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
more fixups
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Feb 2022 10:31:25 +0000 (11:31 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 23 Feb 2022 10:31:25 +0000 (11:31 +0100)
queue-5.10/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch [new file with mode: 0644]
queue-5.10/series
queue-5.15/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch [new file with mode: 0644]
queue-5.15/series
queue-5.16/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch [new file with mode: 0644]
queue-5.16/series

diff --git a/queue-5.10/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/queue-5.10/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
new file mode 100644 (file)
index 0000000..1ba7b1b
--- /dev/null
@@ -0,0 +1,43 @@
+From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann@ionos.com>
+Date: Mon, 21 Feb 2022 11:03:13 +0100
+Subject: lib/iov_iter: initialize "flags" in new pipe_buffer
+
+From: Max Kellermann <max.kellermann@ionos.com>
+
+commit 9d2231c5d74e13b2a0546fee6737ee4446017903 upstream.
+
+The functions copy_page_to_iter_pipe() and push_pipe() can both
+allocate a new pipe_buffer, but the "flags" member initializer is
+missing.
+
+Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
+To: Alexander Viro <viro@zeniv.linux.org.uk>
+To: linux-fsdevel@vger.kernel.org
+To: linux-kernel@vger.kernel.org
+Cc: stable@vger.kernel.org
+Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/iov_iter.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/lib/iov_iter.c
++++ b/lib/iov_iter.c
+@@ -407,6 +407,7 @@ static size_t copy_page_to_iter_pipe(str
+               return 0;
+       buf->ops = &page_cache_pipe_buf_ops;
++      buf->flags = 0;
+       get_page(page);
+       buf->page = page;
+       buf->offset = offset;
+@@ -543,6 +544,7 @@ static size_t push_pipe(struct iov_iter
+                       break;
+               buf->ops = &default_pipe_buf_ops;
++              buf->flags = 0;
+               buf->page = page;
+               buf->offset = 0;
+               buf->len = min_t(ssize_t, left, PAGE_SIZE);
index 7217caa409aab020d6339d516f2590c86a3ce2d3..ee0d9e98c283a4402c37db175cf5c1a8b3357bce 100644 (file)
@@ -98,6 +98,7 @@ arm64-dts-meson-g12-drop-bl32-region-from-sei510-sei.patch
 pidfd-fix-test-failure-due-to-stack-overflow-on-some.patch
 selftests-fixup-build-warnings-in-pidfd-clone3-tests.patch
 kconfig-let-shell-return-enough-output-for-deep-path.patch
+lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
 ata-libata-core-disable-trim-on-m88v29.patch
 soc-aspeed-lpc-ctrl-block-error-printing-on-probe-de.patch
 xprtrdma-fix-pointer-derefs-in-error-cases-of-rpcrdm.patch
diff --git a/queue-5.15/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/queue-5.15/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
new file mode 100644 (file)
index 0000000..bcea1e7
--- /dev/null
@@ -0,0 +1,43 @@
+From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann@ionos.com>
+Date: Mon, 21 Feb 2022 11:03:13 +0100
+Subject: lib/iov_iter: initialize "flags" in new pipe_buffer
+
+From: Max Kellermann <max.kellermann@ionos.com>
+
+commit 9d2231c5d74e13b2a0546fee6737ee4446017903 upstream.
+
+The functions copy_page_to_iter_pipe() and push_pipe() can both
+allocate a new pipe_buffer, but the "flags" member initializer is
+missing.
+
+Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
+To: Alexander Viro <viro@zeniv.linux.org.uk>
+To: linux-fsdevel@vger.kernel.org
+To: linux-kernel@vger.kernel.org
+Cc: stable@vger.kernel.org
+Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/iov_iter.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/lib/iov_iter.c
++++ b/lib/iov_iter.c
+@@ -416,6 +416,7 @@ static size_t copy_page_to_iter_pipe(str
+               return 0;
+       buf->ops = &page_cache_pipe_buf_ops;
++      buf->flags = 0;
+       get_page(page);
+       buf->page = page;
+       buf->offset = offset;
+@@ -532,6 +533,7 @@ static size_t push_pipe(struct iov_iter
+                       break;
+               buf->ops = &default_pipe_buf_ops;
++              buf->flags = 0;
+               buf->page = page;
+               buf->offset = 0;
+               buf->len = min_t(ssize_t, left, PAGE_SIZE);
index 7734718661adff24590aa87513be9e39f7bf2842..2d25287f82e1be56b6d47e93af20c17a9a9aaecf 100644 (file)
@@ -176,6 +176,7 @@ ucounts-handle-wrapping-in-is_ucounts_overlimit.patch
 ucounts-in-set_cred_ucounts-assume-new-ucounts-is-non-null.patch
 ucounts-base-set_cred_ucounts-changes-on-the-real-user.patch
 ucounts-enforce-rlimit_nproc-not-rlimit_nproc-1.patch
+lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
 rlimit-fix-rlimit_nproc-enforcement-failure-caused-by-capability-calls-in-set_user.patch
 ucounts-move-rlimit_nproc-handling-after-set_user.patch
 net-sched-limit-tc_act_repeat-loops.patch
diff --git a/queue-5.16/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/queue-5.16/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
new file mode 100644 (file)
index 0000000..782965d
--- /dev/null
@@ -0,0 +1,43 @@
+From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001
+From: Max Kellermann <max.kellermann@ionos.com>
+Date: Mon, 21 Feb 2022 11:03:13 +0100
+Subject: lib/iov_iter: initialize "flags" in new pipe_buffer
+
+From: Max Kellermann <max.kellermann@ionos.com>
+
+commit 9d2231c5d74e13b2a0546fee6737ee4446017903 upstream.
+
+The functions copy_page_to_iter_pipe() and push_pipe() can both
+allocate a new pipe_buffer, but the "flags" member initializer is
+missing.
+
+Fixes: 241699cd72a8 ("new iov_iter flavour: pipe-backed")
+To: Alexander Viro <viro@zeniv.linux.org.uk>
+To: linux-fsdevel@vger.kernel.org
+To: linux-kernel@vger.kernel.org
+Cc: stable@vger.kernel.org
+Signed-off-by: Max Kellermann <max.kellermann@ionos.com>
+Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ lib/iov_iter.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/lib/iov_iter.c
++++ b/lib/iov_iter.c
+@@ -416,6 +416,7 @@ static size_t copy_page_to_iter_pipe(str
+               return 0;
+       buf->ops = &page_cache_pipe_buf_ops;
++      buf->flags = 0;
+       get_page(page);
+       buf->page = page;
+       buf->offset = offset;
+@@ -579,6 +580,7 @@ static size_t push_pipe(struct iov_iter
+                       break;
+               buf->ops = &default_pipe_buf_ops;
++              buf->flags = 0;
+               buf->page = page;
+               buf->offset = 0;
+               buf->len = min_t(ssize_t, left, PAGE_SIZE);
index 9e596f71913d98a005a24009ec0693ff65c4b590..d8c4998ea8fe3d09627a285953f094be1b6a5e8e 100644 (file)
@@ -204,6 +204,7 @@ x86-bug-merge-annotate_reachable-into-_bug_flags-asm.patch
 netfilter-conntrack-don-t-refresh-sctp-entries-in-cl.patch
 ksmbd-fix-same-uniqueid-for-dot-and-dotdot-entries.patch
 ksmbd-don-t-align-last-entry-offset-in-smb2-query-di.patch
+lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch
 arm64-dts-meson-gx-add-atf-bl32-reserved-memory-regi.patch
 arm64-dts-meson-g12-add-atf-bl32-reserved-memory-reg.patch
 arm64-dts-meson-g12-drop-bl32-region-from-sei510-sei.patch