The patch titled
Subject: radix-tree: fix private list warnings
has been added to the -mm tree. Its filename is
radix-tree-fix-private-list-warnings.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/radix-tree-fix-private-list-warnings.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/radix-tree-fix-private-list-warnings.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
Subject: radix-tree: fix private list warnings
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")
Link: http://lkml.kernel.org/r/1484270903-24307-1-git-send-email-mawilcox@xxxxxxxxxxxxxxxxx
Signed-off-by: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/radix-tree.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff -puN lib/radix-tree.c~radix-tree-fix-private-list-warnings lib/radix-tree.c
--- a/lib/radix-tree.c~radix-tree-fix-private-list-warnings
+++ a/lib/radix-tree.c
@@ -365,6 +365,7 @@ static void radix_tree_node_rcu_free(str
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);
}
@@ -640,7 +641,6 @@ static inline void radix_tree_shrink(str
update_node(node, private);
}
- WARN_ON_ONCE(!list_empty(&node->private_list));
radix_tree_node_free(node);
}
}
@@ -667,7 +667,6 @@ static void delete_node(struct radix_tre
root->rnode = NULL;
}
- WARN_ON_ONCE(!list_empty(&node->private_list));
radix_tree_node_free(node);
node = parent;
@@ -769,7 +768,6 @@ static void radix_tree_free_nodes(struct
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;
_
Patches currently in -mm which might be from mawilcox@xxxxxxxxxxxxx are
radix-tree-fix-private-list-warnings.patch
find_bit-micro-optimise-find_next__bit.patch
find_bit-micro-optimise-find_next__bit-v2.patch
reimplement-idr-and-ida-using-the-radix-tree-support-storing-null-in-the-idr.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
