The patch titled
Subject: xarray-extract-helper-from-__xa_insertcmpxchg-fix
has been added to the -mm mm-nonmm-unstable branch. Its filename is
xarray-extract-helper-from-__xa_insertcmpxchg-fix.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/xarray-extract-helper-from-__xa_insertcmpxchg-fix.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Tamir Duberstein <tamird@xxxxxxxxx>
Subject: xarray-extract-helper-from-__xa_insertcmpxchg-fix
Date: Wed, 4 Dec 2024 10:21:59 -0500
fix __xa_erase()
Link: https://lkml.kernel.org/r/CAJ-ks9kN_qddZ3Ne5d=cADu5POC1rHd4rQcbVSD_spnZOrLLZg@xxxxxxxxxxxxxx
Signed-off-by: Tamir Duberstein <tamird@xxxxxxxxx>
Reported-by: <syzbot+092bbab7da235a02a03a@xxxxxxxxxxxxxxxxxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Pavel Begunkov <asml.silence@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/xarray.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/xarray.c~xarray-extract-helper-from-__xa_insertcmpxchg-fix
+++ a/lib/xarray.c
@@ -1509,7 +1509,7 @@ static void *xas_result(struct xa_state
void *__xa_erase(struct xarray *xa, unsigned long index)
{
XA_STATE(xas, xa, index);
- return xas_result(&xas, xas_store(&xas, NULL));
+ return xas_result(&xas, xa_zero_to_null(xas_store(&xas, NULL)));
}
EXPORT_SYMBOL(__xa_erase);
_
Patches currently in -mm which might be from tamird@xxxxxxxxx are
xarray-extract-xa_zero_to_null.patch
xarray-extract-helper-from-__xa_insertcmpxchg.patch
xarray-extract-helper-from-__xa_insertcmpxchg-fix.patch
xarray-port-tests-to-kunit.patch
