diff options
author | Matthew Wilcox <willy@linux.intel.com> | 2016-05-20 20:01:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-20 20:58:30 -0400 |
commit | 3b8c00f68405e9c037a6d8ae0d5d9da7f8a34e6a (patch) | |
tree | 2669fd1498aa7895abeb85452e82399b91ac78ea /lib | |
parent | db050f2924fcf39428bdadf28970a32cfaf256ef (diff) |
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>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/radix-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 585965afc808..c0366d1d2613 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c | |||
@@ -526,8 +526,8 @@ int __radix_tree_create(struct radix_tree_root *root, unsigned long index, | |||
526 | 526 | ||
527 | #ifdef CONFIG_RADIX_TREE_MULTIORDER | 527 | #ifdef CONFIG_RADIX_TREE_MULTIORDER |
528 | /* Insert pointers to the canonical entry */ | 528 | /* Insert pointers to the canonical entry */ |
529 | if ((shift - order) > 0) { | 529 | if (order > shift) { |
530 | int i, n = 1 << (shift - order); | 530 | int i, n = 1 << (order - shift); |
531 | offset = offset & ~(n - 1); | 531 | offset = offset & ~(n - 1); |
532 | slot = ptr_to_indirect(&node->slots[offset]); | 532 | slot = ptr_to_indirect(&node->slots[offset]); |
533 | for (i = 0; i < n; i++) { | 533 | for (i = 0; i < n; i++) { |