]> www.infradead.org Git - users/jedix/linux-maple.git/commit
radix-tree: fix oops after radix_tree_iter_retry
authorKonstantin Khlebnikov <koct9i@gmail.com>
Fri, 5 Feb 2016 23:37:01 +0000 (15:37 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 26 May 2016 22:44:47 +0000 (15:44 -0700)
commit96d1aa1f8064414f2bca9d61bed910530ddcbb4e
tree161ad4bab571326c52229204d61118d65e41543c
parent7dcf6cd4c84f6e4ddb9f1dac6aa15e78021c3b36
radix-tree: fix oops after radix_tree_iter_retry

Orabug: 23330822

[ Upstream commit 732042821cfa106b3c20b9780e4c60fee9d68900 ]

Helper radix_tree_iter_retry() resets next_index to the current index.
In following radix_tree_next_slot current chunk size becomes zero.  This
isn't checked and it tries to dereference null pointer in slot.

Tagged iterator is fine because retry happens only at slot 0 where tag
bitmask in iter->tags is filled with single bit.

Fixes: 46437f9a554f ("radix-tree: fix race in gang lookup")
Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ohad Ben-Cohen <ohad@wizery.com>
Cc: Jeremiah Mahler <jmmahler@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 42362e1f5a73d36fcaf3eb4950dfc17f633ea0d3)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
include/linux/radix-tree.h