]> git.ipfire.org Git - people/mfischer/ipfire-2.x.git/commitdiff
kernel: Update to 5.15.32
authorPeter Müller <peter.mueller@ipfire.org>
Sat, 2 Apr 2022 11:20:31 +0000 (11:20 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Mon, 4 Apr 2022 20:02:19 +0000 (20:02 +0000)
Refer to https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.32
for the changelog of this version.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
lfs/linux
src/patches/kernel-5.15-CVE-2022-0847.patch [deleted file]

index 018892f7f2b056f6b08de97c9cce734491e9fe6d..c12ba9c4b1006f393421952a849b710022b49691 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,7 +24,7 @@
 
 include Config
 
-VER         = 5.15.23
+VER         = 5.15.32
 ARM_PATCHES = 5.15-ipfire5
 
 THISAPP    = linux-$(VER)
@@ -150,9 +150,6 @@ ifeq "$(BUILD_ARCH)" "aarch64"
 endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux/linux-3.14.79-amba-fix.patch
 
-       # Fix for CVE-2022-0847 aka Dirty Pipe
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/kernel-5.15-CVE-2022-0847.patch
-
 ifeq "$(KCFG)" "-headers"
        # Install the header files
        cd $(DIR_APP) && make ARCH=$(HEADERS_ARCH) $(EXTRAMAKE) headers
diff --git a/src/patches/kernel-5.15-CVE-2022-0847.patch b/src/patches/kernel-5.15-CVE-2022-0847.patch
deleted file mode 100644 (file)
index 5279916..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 114e9f141822e6977633d322c1b03e89bd209932 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max.kellermann@ionos.com>
-Date: Mon, 21 Feb 2022 11:03:13 +0100
-Subject: [PATCH] lib/iov_iter: initialize "flags" in new pipe_buffer
-
-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(+)
-
-diff --git a/lib/iov_iter.c b/lib/iov_iter.c
-index 60b5e6edfbaa..c5b2f0f4b8a8 100644
---- a/lib/iov_iter.c
-+++ b/lib/iov_iter.c
-@@ -416,6 +416,7 @@ static size_t copy_page_to_iter_pipe(struct page *page, size_t offset, size_t by
-               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 *i, size_t size,
-                       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);
--- 
-2.30.2
-