3.6.11.4 stable review patch. If anyone has any objections, please let me know.
------------------ From: Chen Gang <[email protected]> [ Upstream commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 ] audit_trim_trees() calls get_tree(). If a failure occurs we must call put_tree(). [[email protected]: run put_tree() before mutex_lock() for small scalability improvement] Signed-off-by: Chen Gang <[email protected]> Cc: Al Viro <[email protected]> Cc: Eric Paris <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> --- kernel/audit_tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/audit_tree.c b/kernel/audit_tree.c index ed206fd..23b8c66 100644 --- a/kernel/audit_tree.c +++ b/kernel/audit_tree.c @@ -609,9 +609,9 @@ void audit_trim_trees(void) } spin_unlock(&hash_lock); trim_marked(tree); - put_tree(tree); drop_collected_mounts(root_mnt); skip_it: + put_tree(tree); mutex_lock(&audit_filter_mutex); } list_del(&cursor); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
