From: Greg Kroah-Hartman Date: Wed, 23 Feb 2022 10:30:10 +0000 (+0100) Subject: 4.19 and 5.4 fixup X-Git-Tag: v4.9.303~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e44c2872e04eaafcdac57307a031aa2238834f59;p=thirdparty%2Fkernel%2Fstable-queue.git 4.19 and 5.4 fixup --- diff --git a/queue-4.19/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/queue-4.19/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch new file mode 100644 index 00000000000..9f9dfd1e851 --- /dev/null +++ b/queue-4.19/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch @@ -0,0 +1,43 @@ +From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001 +From: Max Kellermann +Date: Mon, 21 Feb 2022 11:03:13 +0100 +Subject: lib/iov_iter: initialize "flags" in new pipe_buffer + +From: Max Kellermann + +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 +To: linux-fsdevel@vger.kernel.org +To: linux-kernel@vger.kernel.org +Cc: stable@vger.kernel.org +Signed-off-by: Max Kellermann +Signed-off-by: Al Viro +Signed-off-by: Greg Kroah-Hartman +--- + lib/iov_iter.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/lib/iov_iter.c ++++ b/lib/iov_iter.c +@@ -393,6 +393,7 @@ static size_t copy_page_to_iter_pipe(str + return 0; + pipe->nrbufs++; + buf->ops = &page_cache_pipe_buf_ops; ++ buf->flags = 0; + get_page(buf->page = page); + buf->offset = offset; + buf->len = bytes; +@@ -517,6 +518,7 @@ static size_t push_pipe(struct iov_iter + break; + pipe->nrbufs++; + pipe->bufs[idx].ops = &default_pipe_buf_ops; ++ pipe->bufs[idx].flags = 0; + pipe->bufs[idx].page = page; + pipe->bufs[idx].offset = 0; + if (left <= PAGE_SIZE) { diff --git a/queue-4.19/series b/queue-4.19/series index 2fbbfbcb1a2..fe52af81905 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -42,6 +42,7 @@ edac-fix-calculation-of-returned-address-and-next-offset-in-edac_align_ptr.patch net-sched-limit-tc_act_repeat-loops.patch dmaengine-sh-rcar-dmac-check-for-error-num-after-setting-mask.patch i2c-brcmstb-fix-support-for-dsl-and-cm-variants.patch +lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch mtd-rawnand-brcmnand-refactored-code-to-introduce-he.patch mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-st.patch drivers-hv-vmbus-expose-monitor-data-only-when-monit.patch diff --git a/queue-5.4/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch b/queue-5.4/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch new file mode 100644 index 00000000000..ac7c82cf362 --- /dev/null +++ b/queue-5.4/lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch @@ -0,0 +1,43 @@ +From 9d2231c5d74e13b2a0546fee6737ee4446017903 Mon Sep 17 00:00:00 2001 +From: Max Kellermann +Date: Mon, 21 Feb 2022 11:03:13 +0100 +Subject: lib/iov_iter: initialize "flags" in new pipe_buffer + +From: Max Kellermann + +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 +To: linux-fsdevel@vger.kernel.org +To: linux-kernel@vger.kernel.org +Cc: stable@vger.kernel.org +Signed-off-by: Max Kellermann +Signed-off-by: Al Viro +Signed-off-by: Greg Kroah-Hartman +--- + lib/iov_iter.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/lib/iov_iter.c ++++ b/lib/iov_iter.c +@@ -398,6 +398,7 @@ static size_t copy_page_to_iter_pipe(str + return 0; + pipe->nrbufs++; + buf->ops = &page_cache_pipe_buf_ops; ++ buf->flags = 0; + get_page(buf->page = page); + buf->offset = offset; + buf->len = bytes; +@@ -524,6 +525,7 @@ static size_t push_pipe(struct iov_iter + break; + pipe->nrbufs++; + pipe->bufs[idx].ops = &default_pipe_buf_ops; ++ pipe->bufs[idx].flags = 0; + pipe->bufs[idx].page = page; + pipe->bufs[idx].offset = 0; + if (left <= PAGE_SIZE) { diff --git a/queue-5.4/series b/queue-5.4/series index 04e8bd81908..07fe2eb924f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -56,6 +56,7 @@ mtd-rawnand-qcom-fix-clock-sequencing-in-qcom_nandc_probe.patch mtd-rawnand-brcmnand-fixed-incorrect-sub-page-ecc-status.patch scsi-lpfc-fix-pt2pt-nvme-prli-reject-logo-loop.patch edac-fix-calculation-of-returned-address-and-next-offset-in-edac_align_ptr.patch +lib-iov_iter-initialize-flags-in-new-pipe_buffer.patch net-sched-limit-tc_act_repeat-loops.patch dmaengine-sh-rcar-dmac-check-for-error-num-after-setting-mask.patch copy_process-move-fd_install-out-of-sighand-siglock-critical-section.patch