mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-15 23:25:07 +00:00
maple_tree: fix mas_prev() and mas_find() state handling
commit17dc622c7b
upstream. When mas_prev() does not find anything, set the state to MAS_NONE. Handle the MAS_NONE in mas_find() like a MAS_START. Link: https://lkml.kernel.org/r/20230120162650.984577-7-Liam.Howlett@oracle.com Cc: <Stable@vger.kernel.org> Fixes:54a611b605
("Maple Tree: add new data structure") Signed-off-by: Liam R. Howlett <Liam.Howlett@oracle.com> Reported-by: <syzbot+502859d610c661e56545@syzkaller.appspotmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
19d8f782e3
commit
0a0372d1d2
1 changed files with 5 additions and 1 deletions
|
@ -4844,7 +4844,7 @@ static inline void *mas_prev_entry(struct ma_state *mas, unsigned long min)
|
|||
|
||||
if (mas->index < min) {
|
||||
mas->index = mas->last = min;
|
||||
mas_pause(mas);
|
||||
mas->node = MAS_NONE;
|
||||
return NULL;
|
||||
}
|
||||
retry:
|
||||
|
@ -5906,6 +5906,7 @@ void *mas_prev(struct ma_state *mas, unsigned long min)
|
|||
if (!mas->index) {
|
||||
/* Nothing comes before 0 */
|
||||
mas->last = 0;
|
||||
mas->node = MAS_NONE;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
@ -5996,6 +5997,9 @@ void *mas_find(struct ma_state *mas, unsigned long max)
|
|||
mas->index = ++mas->last;
|
||||
}
|
||||
|
||||
if (unlikely(mas_is_none(mas)))
|
||||
mas->node = MAS_START;
|
||||
|
||||
if (unlikely(mas_is_start(mas))) {
|
||||
/* First run or continue */
|
||||
void *entry;
|
||||
|
|
Loading…
Reference in a new issue