aboutsummaryrefslogtreecommitdiffstats
path: root/security/apparmor/policy.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-30 00:55:11 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-11-30 00:55:11 -0500
commit7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch)
treef23b591e8c6f921c91fce00a6453d4087ec3c071 /security/apparmor/policy.c
parent5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff)
parent193006f7e3b1abd42d7a3677b54fa2996461a842 (diff)
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'security/apparmor/policy.c')
-rw-r--r--security/apparmor/policy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index 52cc865f1464..4f0eadee78b8 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -306,7 +306,7 @@ static struct aa_namespace *alloc_namespace(const char *prefix,
306 return ns; 306 return ns;
307 307
308fail_unconfined: 308fail_unconfined:
309 kzfree(ns->base.name); 309 kzfree(ns->base.hname);
310fail_ns: 310fail_ns:
311 kzfree(ns); 311 kzfree(ns);
312 return NULL; 312 return NULL;