From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750932AbdALXmQ (ORCPT ); Thu, 12 Jan 2017 18:42:16 -0500 Received: from p3plsmtps2ded04.prod.phx3.secureserver.net ([208.109.80.198]:37262 "EHLO p3plsmtps2ded04.prod.phx3.secureserver.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750760AbdALXmP (ORCPT ); Thu, 12 Jan 2017 18:42:15 -0500 X-Greylist: delayed 675 seconds by postgrey-1.27 at vger.kernel.org; Thu, 12 Jan 2017 18:42:15 EST x-originating-ip: 72.167.245.219 From: Matthew Wilcox To: Johannes Weiner , Linus Torvalds Cc: Matthew Wilcox , Andrew Morton , linux-kernel@vger.kernel.org Subject: [PATCH] radix-tree: Fix private list warnings Date: Thu, 12 Jan 2017 17:28:23 -0800 Message-Id: <1484270903-24307-1-git-send-email-mawilcox@linuxonhyperv.com> X-Mailer: git-send-email 1.7.4.1 X-CMAE-Envelope: MS4wfHhdDY/U9pLeVGiFyFB953i9fbSM2+R15LxxvqSypvKqY3jVFHW8O5KVvN8OwDVb6DIYOdH6dWEmQ9quv81ewprOa7QtR+2bNR/aa1F8IKtVPocjKERW 8bwXzPUPDYuIGl7haMpyYoa/SljJbL2B8o4BSFi6iWAPKMI91RbDQLse+ERIJQIyLA6BAZUBk1GeXB9KFTHt4cN6kn6wnh/9ecIjmD5PsecT7u3sg9f7AEtr rbqQQA6FdMlJe4mLEdeGCA8owCHmIxB6cV7D7cGMid1nUnic5mDj6UKu6ClHO82iUFI9mI8sFpKh3pcV6wkrHik1C1mmYllhxzr3eVrXViYSR5TiByRbEvc+ /SMIebK4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox The newly introduced warning in radix_tree_free_nodes() was testing the wrong variable; it should have been 'old' instead of 'node'. Rather than replace that one instance, I noticed that we can simply put the WARN_ON_ONCE in radix_tree_node_free() and it will be just as effective. Fixes: ea07b862ac8e ("mm: workingset: fix use-after-free in shadow node shrinker") Signed-off-by: Matthew Wilcox --- lib/radix-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/radix-tree.c b/lib/radix-tree.c index 4a4ed3ee4222..3c4577cabc57 100644 --- a/lib/radix-tree.c +++ b/lib/radix-tree.c @@ -449,6 +449,7 @@ static void radix_tree_node_rcu_free(struct rcu_head *head) static inline void radix_tree_node_free(struct radix_tree_node *node) { + WARN_ON_ONCE(!list_empty(&node->private_list)); call_rcu(&node->rcu_head, radix_tree_node_rcu_free); } @@ -734,7 +735,6 @@ static inline void radix_tree_shrink(struct radix_tree_root *root, update_node(node, private); } - WARN_ON_ONCE(!list_empty(&node->private_list)); radix_tree_node_free(node); } } @@ -766,7 +766,6 @@ static void delete_node(struct radix_tree_root *root, root->rnode = NULL; } - WARN_ON_ONCE(!list_empty(&node->private_list)); radix_tree_node_free(node); node = parent; @@ -868,7 +867,6 @@ static void radix_tree_free_nodes(struct radix_tree_node *node) struct radix_tree_node *old = child; offset = child->offset + 1; child = child->parent; - WARN_ON_ONCE(!list_empty(&node->private_list)); radix_tree_node_free(old); if (old == entry_to_node(node)) return; -- 2.11.0.296.g5800ad326.dirty