[PATCH 3.8-stable] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()

[PATCH 3.8-stable] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()

[Jonghwan Choi]

This patch looks like it should be in the 3.8-stable tree, should we apply
it?

------------------

From: "Chen Gang <gang.chen@asianux.com>"

commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream

audit_trim_trees() calls get_tree().  If a failure occurs we must call
put_tree().

[akpm@linux-foundation.org: run put_tree() before mutex_lock() for small
scalability improvement]
Signed-off-by: Chen Gang <gang.chen@asianux.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
---
 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 642a89c..a291aa2 100644
--- a/kernel/audit_tree.c
+++ b/kernel/audit_tree.c
@@ -617,9 +617,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.9.5

Re: [PATCH 3.8-stable] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()

[Chen Gang]

On 2013年04月30日 16:44, Jonghwan Choi wrote:
> This patch looks like it should be in the 3.8-stable tree, should we apply
> it?

For me, I recommend it.  :-)

Thanks.

-- 
Chen Gang

Asianux Corporation

Re: [PATCH 3.8-stable] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()

[Luis Henriques]

On Tue, Apr 30, 2013 at 05:44:01PM +0900, Jonghwan Choi wrote:
> This patch looks like it should be in the 3.8-stable tree, should we apply
> it?

This commit seems to be applicable to other stable trees as well (3.0,
3.2, 3.5, ...).

Cheers,
--
Luis


> 
> ------------------
> 
> From: "Chen Gang <gang.chen@asianux.com>"
> 
> commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream
> 
> audit_trim_trees() calls get_tree().  If a failure occurs we must call
> put_tree().
> 
> [akpm@linux-foundation.org: run put_tree() before mutex_lock() for small
> scalability improvement]
> Signed-off-by: Chen Gang <gang.chen@asianux.com>
> Cc: Al Viro <viro@zeniv.linux.org.uk>
> Cc: Eric Paris <eparis@redhat.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
> Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com>
> ---
>  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 642a89c..a291aa2 100644
> --- a/kernel/audit_tree.c
> +++ b/kernel/audit_tree.c
> @@ -617,9 +617,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.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 3.8-stable] kernel/audit_tree.c: tree will leak memory when failure occurs in audit_trim_trees()

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]

On Wed, 2013-05-08 at 11:36 +0100, Luis Henriques wrote:
> On Tue, Apr 30, 2013 at 05:44:01PM +0900, Jonghwan Choi wrote:
> > This patch looks like it should be in the 3.8-stable tree, should we apply
> > it?
> 
> This commit seems to be applicable to other stable trees as well (3.0,
> 3.2, 3.5, ...).
[...]

I've queued this up for 3.2, thanks all.

Ben.

-- 
Ben Hutchings
For every action, there is an equal and opposite criticism. - Harrison

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]