From: Peng Zhang <zhangpeng.00@bytedance.com>
To: Liam.Howlett@oracle.com
Cc: akpm@linux-foundation.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org,
Peng Zhang <zhangpeng.00@bytedance.com>
Subject: [PATCH 1/9] maple_tree: Fix allocation when min is equal to max in mas_empty_area/_area_rev()
Date: Tue, 25 Apr 2023 19:05:03 +0800 [thread overview]
Message-ID: <20230425110511.11680-2-zhangpeng.00@bytedance.com> (raw)
In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com>
Make the allocation valid when min is equal to max in mas_empty_area()
and mas_empty_area_rev(). As Liam R. Howlett said, VMA doesn't make this
allocation, so now this bug won't trigger.
Also add some checks for invalid parameters.
Fixes: 54a611b60590 ("Maple Tree: add new data structure")
Signed-off-by: Peng Zhang <zhangpeng.00@bytedance.com>
---
lib/maple_tree.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/maple_tree.c b/lib/maple_tree.c
index 110a36479dced..72099b4b32169 100644
--- a/lib/maple_tree.c
+++ b/lib/maple_tree.c
@@ -5289,7 +5289,10 @@ int mas_empty_area(struct ma_state *mas, unsigned long min,
unsigned long *pivots;
enum maple_type mt;
- if (min >= max)
+ if (unlikely(min > max))
+ return -EINVAL;
+
+ if (unlikely(size == 0) || unlikely(max - min < size - 1))
return -EINVAL;
if (mas_is_start(mas))
@@ -5344,7 +5347,10 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
{
struct maple_enode *last = mas->node;
- if (min >= max)
+ if (unlikely(min > max))
+ return -EINVAL;
+
+ if (unlikely(size == 0) || unlikely(max - min < size - 1))
return -EINVAL;
if (mas_is_start(mas)) {
@@ -5380,7 +5386,7 @@ int mas_empty_area_rev(struct ma_state *mas, unsigned long min,
return -EBUSY;
/* Trim the upper limit to the max. */
- if (max <= mas->last)
+ if (max < mas->last)
mas->last = max;
mas->index = mas->last - size + 1;
--
2.20.1
next prev parent reply other threads:[~2023-04-25 11:05 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-25 11:05 [PATCH 0/9] fix, rework and clean up for maple tree Peng Zhang
2023-04-25 11:05 ` Peng Zhang [this message]
2023-04-25 11:05 ` [PATCH 2/9] maple_tree: Make maple state reusable after mas_empty_area() Peng Zhang
2023-04-25 16:00 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 3/9] maple_tree: Modify the allocation method of mtree_alloc_range/rrange() Peng Zhang
2023-04-25 16:08 ` Liam R. Howlett
2023-04-26 12:34 ` Peng Zhang
2023-04-27 1:10 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 4/9] maple_tree: Update mtree_alloc_rrange() and mtree_alloc_range() testing Peng Zhang
2023-04-25 16:09 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 5/9] maple_tree: Remove an if statement that cannot be true Peng Zhang
2023-04-25 16:16 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 6/9] maple_tree: Remove a confusing check Peng Zhang
2023-04-25 16:23 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 7/9] maple_tree: Delete redundant code in mas_next_node() Peng Zhang
2023-04-25 16:45 ` Liam R. Howlett
2023-04-26 11:43 ` Peng Zhang
2023-04-25 11:05 ` [PATCH 8/9] maple_tree: Remove the redundant check of mas->offset in mas_empty_area/area_rev() Peng Zhang
2023-04-25 17:00 ` Liam R. Howlett
2023-04-25 11:05 ` [PATCH 9/9] maple_tree: Move declaration of mas_empty_area_rev() to a better place Peng Zhang
2023-04-25 17:04 ` Liam R. Howlett
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230425110511.11680-2-zhangpeng.00@bytedance.com \
--to=zhangpeng.00@bytedance.com \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=maple-tree@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox