From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DB4A215800F for ; Sun, 19 Feb 2023 22:39:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 211BFE09F5; Sun, 19 Feb 2023 22:39:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 00ECFE09F5 for ; Sun, 19 Feb 2023 22:39:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CFBBF34085A for ; Sun, 19 Feb 2023 22:39:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CD7F531 for ; Sun, 19 Feb 2023 22:39:26 +0000 (UTC) From: "Mike Pagano" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Pagano" Message-ID: <1676846346.5241ddd6b8b8c9729a51139525ff50ab4a7bf589.mpagano@gentoo> Subject: [gentoo-commits] proj/linux-patches:6.2 commit in: / X-VCS-Repository: proj/linux-patches X-VCS-Files: 0000_README 1800_maple-tree-fix-mas-empty-area-rev-lower-bound-val.patch X-VCS-Directories: / X-VCS-Committer: mpagano X-VCS-Committer-Name: Mike Pagano X-VCS-Revision: 5241ddd6b8b8c9729a51139525ff50ab4a7bf589 X-VCS-Branch: 6.2 Date: Sun, 19 Feb 2023 22:39:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 08174091-8feb-41f5-9ed0-ba80f449398b X-Archives-Hash: a652feeea893950d58604ba39eb49c26 commit: 5241ddd6b8b8c9729a51139525ff50ab4a7bf589 Author: Mike Pagano gentoo org> AuthorDate: Sun Feb 19 22:39:06 2023 +0000 Commit: Mike Pagano gentoo org> CommitDate: Sun Feb 19 22:39:06 2023 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=5241ddd6 Remove redundant patch Removed: 1800_maple-tree-fix-mas-empty-area-rev-lower-bound-val.patch Signed-off-by: Mike Pagano gentoo.org> 0000_README | 4 -- ...ee-fix-mas-empty-area-rev-lower-bound-val.patch | 82 ---------------------- 2 files changed, 86 deletions(-) diff --git a/0000_README b/0000_README index 22c89532..f16c77ca 100644 --- a/0000_README +++ b/0000_README @@ -55,10 +55,6 @@ Patch: 1700_sparc-address-warray-bound-warnings.patch From: https://github.com/KSPP/linux/issues/109 Desc: Address -Warray-bounds warnings -Patch: 1800_maple-tree-fix-mas-empty-area-rev-lower-bound-val.patch -From: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git -Desc: maple_tree: fix mas_empty_area_rev() lower bound validation - Patch: 2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch From: https://lore.kernel.org/linux-bluetooth/20190522070540.48895-1-marcel@holtmann.org/raw Desc: Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. See bug #686758 diff --git a/1800_maple-tree-fix-mas-empty-area-rev-lower-bound-val.patch b/1800_maple-tree-fix-mas-empty-area-rev-lower-bound-val.patch deleted file mode 100644 index 53075739..00000000 --- a/1800_maple-tree-fix-mas-empty-area-rev-lower-bound-val.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ebc4c1bcc2a513bb2292dc73aa247b046bc846ce Mon Sep 17 00:00:00 2001 -From: Liam Howlett -Date: Wed, 11 Jan 2023 20:02:07 +0000 -Subject: maple_tree: fix mas_empty_area_rev() lower bound validation - -mas_empty_area_rev() was not correctly validating the start of a gap -against the lower limit. This could lead to the range starting lower than -the requested minimum. - -Fix the issue by better validating a gap once one is found. - -This commit also adds tests to the maple tree test suite for this issue -and tests the mas_empty_area() function for similar bound checking. - -Link: https://lkml.kernel.org/r/20230111200136.1851322-1-Liam.Howlett@oracle.com -Link: https://bugzilla.kernel.org/show_bug.cgi?id=216911 -Fixes: 54a611b60590 ("Maple Tree: add new data structure") -Signed-off-by: Liam R. Howlett -Reported-by: - Link: https://lore.kernel.org/linux-mm/0b9f5425-08d4-8013-aa4c-e620c3b10bb2@leemhuis.info/ -Tested-by: Holger Hoffsttte -Cc: -Signed-off-by: Andrew Morton ---- - lib/maple_tree.c | 17 ++++++++--------- - 1 file changed, 8 insertions(+), 9 deletions(-) - -(limited to 'lib/maple_tree.c') - -diff --git a/lib/maple_tree.c b/lib/maple_tree.c -index 26e2045d3cda9..b990ccea454ec 100644 ---- a/lib/maple_tree.c -+++ b/lib/maple_tree.c -@@ -4887,7 +4887,7 @@ static bool mas_rev_awalk(struct ma_state *mas, unsigned long size) - unsigned long *pivots, *gaps; - void __rcu **slots; - unsigned long gap = 0; -- unsigned long max, min, index; -+ unsigned long max, min; - unsigned char offset; - - if (unlikely(mas_is_err(mas))) -@@ -4909,8 +4909,7 @@ static bool mas_rev_awalk(struct ma_state *mas, unsigned long size) - min = mas_safe_min(mas, pivots, --offset); - - max = mas_safe_pivot(mas, pivots, offset, type); -- index = mas->index; -- while (index <= max) { -+ while (mas->index <= max) { - gap = 0; - if (gaps) - gap = gaps[offset]; -@@ -4941,10 +4940,8 @@ static bool mas_rev_awalk(struct ma_state *mas, unsigned long size) - min = mas_safe_min(mas, pivots, offset); - } - -- if (unlikely(index > max)) { -- mas_set_err(mas, -EBUSY); -- return false; -- } -+ if (unlikely((mas->index > max) || (size - 1 > max - mas->index))) -+ goto no_space; - - if (unlikely(ma_is_leaf(type))) { - mas->offset = offset; -@@ -4961,9 +4958,11 @@ static bool mas_rev_awalk(struct ma_state *mas, unsigned long size) - return false; - - ascend: -- if (mte_is_root(mas->node)) -- mas_set_err(mas, -EBUSY); -+ if (!mte_is_root(mas->node)) -+ return false; - -+no_space: -+ mas_set_err(mas, -EBUSY); - return false; - } - --- -cgit -