From patchwork Sat Apr 2 11:20:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 5422 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4KVvjT3Xbmz3wf7 for ; Sat, 2 Apr 2022 11:20:45 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4KVvjR4VBPz1ly; Sat, 2 Apr 2022 11:20:43 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4KVvjR35r7z2ynw; Sat, 2 Apr 2022 11:20:43 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4KVvjQ1MbYz2xWS for ; Sat, 2 Apr 2022 11:20:42 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4KVvjN68mNzs9 for ; Sat, 2 Apr 2022 11:20:40 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1648898441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkzbJhqX3LWNhxYuMddx2/4I+9d6nxUG1SSvIdgWk5s=; b=YSse12bsLAbmwbgbICYKRd4VZ+YiPu4gwwh9z/7xHrMJfgjpnVUECYyyxy7rDqEYpCdt+8 xHNZbrvv6QF9K2AQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1648898441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VkzbJhqX3LWNhxYuMddx2/4I+9d6nxUG1SSvIdgWk5s=; b=KXEdKTxw2T8F/0/LPvYfNwWePW/CZyHUh3PMg7OHNVHYqCrpS4doG14CG5LKnG/8Q14Gsl 0QCiP28EcrASOyTjD2d/DK2qr/F0weLnh0sRccE2k5Do2AO6eu/ATM+RSfF/G+pan4fbE1 S72w0AxUh9R70k8aOur8zaLbIU8aA3sdGwdy7GHCTf+rg/u56FvGBGHnFE1Su43vWPUKcN 5igA0fkCUhGu0h3NwFDu7RDbH+3qM7yOvcJVNqVUStT8PSIB22xOdZY22VFkMaPWJLwo6M 1TQLheurs2jIOcLKzChP9tVG1aVYKWOnoYxJqqQJRDEKf3M8WqL7HHhi6Asppg== Message-ID: <7908bb93-0155-74d0-d64f-fb26abc6c498@ipfire.org> Date: Sat, 2 Apr 2022 11:20:31 +0000 MIME-Version: 1.0 Content-Language: en-US To: "IPFire: Development" From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH] kernel: Update to 5.15.32 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- lfs/linux | 7 +--- src/patches/kernel-5.15-CVE-2022-0847.patch | 46 --------------------- 2 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 src/patches/kernel-5.15-CVE-2022-0847.patch diff --git a/lfs/linux b/lfs/linux index 26302b179..b1b3939a9 100644 --- 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) @@ -78,7 +78,7 @@ objects =$(DL_FILE) \ $(DL_FILE) = $(URL_IPFIRE)/$(DL_FILE) arm-multi-patches-$(ARM_PATCHES).patch.xz = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz -$(DL_FILE)_MD5 = 5e4405eabbf6b365fd5c9252f666ca60 +$(DL_FILE)_MD5 = 1b05042dc7fc010d9bc5f6885efbda6b arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5 = 5b588bcdf9d21cc7e8ce57c94b775195 install : $(TARGET) @@ -149,9 +149,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 index 5279916c2..000000000 --- a/src/patches/kernel-5.15-CVE-2022-0847.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 114e9f141822e6977633d322c1b03e89bd209932 Mon Sep 17 00:00:00 2001 -From: Max Kellermann -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 -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(+) - -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 -