p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

radix-tree: fix sibling entry insertion 

The subtraction was the wrong way round, leading to undefined behaviour
(shift by an amount larger than the size of the type).

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Cc: Kirill Shutemov <kirill.shutemov@linux.intel.com>
Cc: Jan Kara <jack@suse.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matthew Wilcox 2016-05-20 17:01:59 -07:00 committed by Linus Torvalds
parent db050f2924
commit 3b8c00f684
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/radix-tree.c
View File

@ -526,8 +526,8 @@ int __radix_tree_create(struct radix_tree_root *root, unsigned long index,
#ifdef CONFIG_RADIX_TREE_MULTIORDER #ifdef CONFIG_RADIX_TREE_MULTIORDER
/* Insert pointers to the canonical entry */ /* Insert pointers to the canonical entry */
if ((shift - order) > 0) { if (order > shift) {
int i, n = 1 << (shift - order); int i, n = 1 << (order - shift);
offset = offset & ~(n - 1); offset = offset & ~(n - 1);
slot = ptr_to_indirect(&node->slots[offset]); slot = ptr_to_indirect(&node->slots[offset]);
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {