2013-04-30 08:44:08

by Jonghwan Choi

[permalink] [raw]

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

---

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

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

From: "Chen Gang <[email protected]>"

commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream

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: Jonghwan Choi <[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 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

2013-05-02 01:33:55

by Chen Gang

[permalink] [raw]

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

---

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

2013-05-08 10:36:16

by Luis Henriques

[permalink] [raw]

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

---

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 <[email protected]>"
>
> commit 12b2f117f3bf738c1a00a6f64393f1953a740bd4 upstream
>
> 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: Jonghwan Choi <[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 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 [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-05-10 04:39:06

by Ben Hutchings

[permalink] [raw]

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

---

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

---

Attachments:

signature.asc (828.00 B)
This is a digitally signed message part