XArray: Fix infinite loop with entry at ULONG_MAX

If there is an entry at ULONG_MAX, xa_for_each() will overflow the
'index + 1' in xa_find_after() and wrap around to 0.  Catch this case
and terminate the loop by returning NULL.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: stable@vger.kernel.org

diff --git a/lib/test_xarray.c b/lib/test_xarray.c
index c477f22a95cd2c9f1f2a48dd02966c8c0f2c8864..90584c63ca39a856bce6f7aba454218e9dd947e5 100644 (file)
--- a/lib/test_xarray.c
+++ b/lib/test_xarray.c
@@ -1046,11 +1046,28 @@ static noinline void check_find_3(struct xarray *xa)
        xa_destroy(xa);
 }
 
+static noinline void check_find_4(struct xarray *xa)
+{
+       unsigned long index = 0;
+       void *entry;
+
+       xa_store_index(xa, ULONG_MAX, GFP_KERNEL);
+
+       entry = xa_find_after(xa, &index, ULONG_MAX, XA_PRESENT);
+       XA_BUG_ON(xa, entry != xa_mk_index(ULONG_MAX));
+
+       entry = xa_find_after(xa, &index, ULONG_MAX, XA_PRESENT);
+       XA_BUG_ON(xa, entry);
+
+       xa_erase_index(xa, ULONG_MAX);
+}
+
 static noinline void check_find(struct xarray *xa)
 {
        check_find_1(xa);
        check_find_2(xa);
        check_find_3(xa);
+       check_find_4(xa);
        check_multi_find(xa);
        check_multi_find_2(xa);
 }

diff --git a/lib/xarray.c b/lib/xarray.c
index bfaaa2c1f3fef67f3cdbf27f532964e0ca3f1928..6ecf35c2e1da9ce99793c4ac0ee4c4e82f83363d 100644 (file)
--- a/lib/xarray.c
+++ b/lib/xarray.c
@@ -1849,6 +1849,9 @@ void *xa_find_after(struct xarray *xa, unsigned long *indexp,
        XA_STATE(xas, xa, *indexp + 1);
        void *entry;
 
+       if (xas.xa_index == 0)
+               return NULL;
+
        rcu_read_lock();
        for (;;) {
                if ((__force unsigned int)filter < XA_MAX_MARKS)