Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c91c364 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

[PATCH] buglet in radix_tree_tag_set 



The comment states: 'Setting a tag on a not-present item is a BUG.' Hence
if 'index' is larger than the maxindex; the item _cannot_ be presen; it
should also be a BUG.

Also, this allows the following statement (assume a fresh tree):

  radix_tree_tag_set(root, 16, 1);

to fail silently, but when preceded by:

  radix_tree_insert(root, 32, item);

it would BUG, because the height has been extended by the insert.

In neither case was 16 present.

Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: default avatarNick Piggin <npiggin@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 58ce1fd5

lib/radix-tree.c

+1 −2
Original line number Diff line number Diff line
@@ -389,8 +389,7 @@ void *radix_tree_tag_set(struct radix_tree_root *root, 
	struct radix_tree_node *slot;



	height = root->height;

	if (index > radix_tree_maxindex(height))

		return NULL;

	BUG_ON(index > radix_tree_maxindex(height));



	slot = root->rnode;

	shift = (height - 1) * RADIX_TREE_MAP_SHIFT;