maple_tree-fix-mas_empty_area_rev-lower-bound-validation.patch removed from -mm tree
The quilt patch titled
Subject: maple_tree: fix mas_empty_area_rev() lower bound validation
has been removed from the -mm tree. Its filename was
maple_tree-fix-mas_empty_area_rev-lower-bound-validation.patch
This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Liam Howlett <[email protected]>
Subject: maple_tree: fix mas_empty_area_rev() lower bound validation
Date: Wed, 11 Jan 2023 20:02:07 +0000
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.
---
lib/maple_tree.c | 17 +++---- lib/test_maple_tree.c | 89 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 9 deletions(-)
lib/maple_tree.c renamed from lib/maple_tree.c~maple_tree-fix-mas_empty_area_rev-lower-bound-validation +8 -9
@@ -4887,7 +4887,7 @@ static bool mas_rev_awalk(struct ma_statunsigned 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_stat 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_stat 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_statreturn 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; }
lib/test_maple_tree.c renamed from lib/test_maple_tree.c~maple_tree-fix-mas_empty_area_rev-lower-bound-validation +89 -0
101 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are