diff options
| author | Matthew Wilcox <willy@infradead.org> | 2018-12-13 13:57:42 -0500 |
|---|---|---|
| committer | Matthew Wilcox <willy@infradead.org> | 2018-12-13 14:07:33 -0500 |
| commit | 48483614de97c4f5219abeda630e62b2bebdce62 (patch) | |
| tree | efd9c5d74cf60cdd6ff5c5f618f74e6fffed0493 /lib/xarray.c | |
| parent | 4f145cd66a1a76136ff5a03a99e37ba082715dc6 (diff) | |
| download | linux-stable-48483614de97c4f5219abeda630e62b2bebdce62.tar.gz linux-stable-48483614de97c4f5219abeda630e62b2bebdce62.tar.bz2 linux-stable-48483614de97c4f5219abeda630e62b2bebdce62.zip | |
XArray: Fix xa_alloc when id exceeds max
Specifying a starting ID greater than the maximum ID isn't something
attempted very often, but it should fail. It was succeeding due to
xas_find_marked() returning the wrong error state, so add tests for
both xa_alloc() and xas_find_marked().
Fixes: b803b42823d0 ("xarray: Add XArray iterators")
Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to 'lib/xarray.c')
| -rw-r--r-- | lib/xarray.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/xarray.c b/lib/xarray.c index bbacca576593..5f3f9311de89 100644 --- a/lib/xarray.c +++ b/lib/xarray.c @@ -1131,7 +1131,7 @@ void *xas_find_marked(struct xa_state *xas, unsigned long max, xa_mark_t mark) entry = xa_head(xas->xa); xas->xa_node = NULL; if (xas->xa_index > max_index(entry)) - goto bounds; + goto out; if (!xa_is_node(entry)) { if (xa_marked(xas->xa, mark)) return entry; @@ -1180,11 +1180,9 @@ void *xas_find_marked(struct xa_state *xas, unsigned long max, xa_mark_t mark) } out: - if (!max) + if (xas->xa_index > max) goto max; -bounds: - xas->xa_node = XAS_BOUNDS; - return NULL; + return set_bounds(xas); max: xas->xa_node = XAS_RESTART; return NULL; |