From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:51067 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755431AbcBXDx4 (ORCPT ); Tue, 23 Feb 2016 22:53:56 -0500 Subject: Patch "radix-tree: fix oops after radix_tree_iter_retry" has been added to the 3.14-stable tree To: koct9i@gmail.com, akpm@linux-foundation.org, gregkh@linuxfoundation.org, hughd@google.com, jmmahler@gmail.com, ohad@wizery.com, torvalds@linux-foundation.org, willy@linux.intel.com Cc: , From: Date: Tue, 23 Feb 2016 19:23:49 -0800 Message-ID: <14562842292958@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled radix-tree: fix oops after radix_tree_iter_retry to the 3.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: radix-tree-fix-oops-after-radix_tree_iter_retry.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 732042821cfa106b3c20b9780e4c60fee9d68900 Mon Sep 17 00:00:00 2001 From: Konstantin Khlebnikov Date: Fri, 5 Feb 2016 15:37:01 -0800 Subject: radix-tree: fix oops after radix_tree_iter_retry From: Konstantin Khlebnikov commit 732042821cfa106b3c20b9780e4c60fee9d68900 upstream. 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 Cc: Matthew Wilcox Cc: Hugh Dickins Cc: Ohad Ben-Cohen Cc: Jeremiah Mahler Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- include/linux/radix-tree.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/include/linux/radix-tree.h +++ b/include/linux/radix-tree.h @@ -341,7 +341,7 @@ void **radix_tree_iter_retry(struct radi * @iter: pointer to radix tree iterator * Returns: current chunk size */ -static __always_inline unsigned +static __always_inline long radix_tree_chunk_size(struct radix_tree_iter *iter) { return iter->next_index - iter->index; @@ -375,9 +375,9 @@ radix_tree_next_slot(void **slot, struct return slot + offset + 1; } } else { - unsigned size = radix_tree_chunk_size(iter) - 1; + long size = radix_tree_chunk_size(iter); - while (size--) { + while (--size > 0) { slot++; iter->index++; if (likely(*slot)) Patches currently in stable-queue which might be from koct9i@gmail.com are queue-3.14/radix-tree-fix-oops-after-radix_tree_iter_retry.patch