linux-kernel - Re: [PATCH] kernel/audit_tree.c: tree will memory leak when failure occurs for audit_trim

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130422160409.471f6208099a972d26c29fb9@linux-foundation.org>
Date:	Mon, 22 Apr 2013 16:04:09 -0700
From:	Andrew Morton <akpm@...ux-foundation.org>
To:	Chen Gang <gang.chen@...anux.com>
Cc:	Eric Paris <eparis@...hat.com>, Al Viro <viro@...iv.linux.org.uk>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] kernel/audit_tree.c: tree will memory leak when failure
 occurs for audit_trim_trees()

On Fri, 19 Apr 2013 17:39:06 +0800 Chen Gang <gang.chen@...anux.com> wrote:

> 
> in audit_trim_trees(), has called get_tree() before failure occurs,
> so need also call put_tree after go to skip_it:
> 
> ...
>
> --- a/kernel/audit_tree.c
> +++ b/kernel/audit_tree.c
> @@ -617,10 +617,10 @@ void audit_trim_trees(void)
>  		}
>  		spin_unlock(&hash_lock);
>  		trim_marked(tree);
> -		put_tree(tree);
>  		drop_collected_mounts(root_mnt);
>  skip_it:
>  		mutex_lock(&audit_filter_mutex);
> +		put_tree(tree);
>  	}
>  	list_del(&cursor);
>  	mutex_unlock(&audit_filter_mutex);

That looks right to me.

I think we can micro-optimise the code by performing the put_tree()
before taking the mutex, to slightly reduce mutex hold times?

--- a/kernel/audit_tree.c~kernel-audit_treec-tree-will-leak-memory-when-failure-occurs-in-audit_trim_trees-fix
+++ a/kernel/audit_tree.c
@@ -619,8 +619,8 @@ void audit_trim_trees(void)
 		trim_marked(tree);
 		drop_collected_mounts(root_mnt);
 skip_it:
-		mutex_lock(&audit_filter_mutex);
 		put_tree(tree);
+		mutex_lock(&audit_filter_mutex);
 	}
 	list_del(&cursor);
 	mutex_unlock(&audit_filter_mutex);
_


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/