diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 19:00:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-12 19:00:25 +0300 |
| commit | fe7e96f66b2622d8492ee9dd7fc08b811086caca (patch) | |
| tree | 524b78f3a5a9c35bee8b437e9c4738d42fc454a7 /security/apparmor/policy.c | |
| parent | 0f90933c477c061df6daf42d814ff2012aea43cc (diff) | |
| parent | a26d279ea87e9fef2cf8a44b371e48e6091975a6 (diff) | |
| download | linux-fe7e96f66b2622d8492ee9dd7fc08b811086caca.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
APPARMOR: Fix memory leak of apparmor_init()
APPARMOR: Fix memory leak of alloc_namespace()
Diffstat (limited to 'security/apparmor/policy.c')
| -rw-r--r-- | security/apparmor/policy.c | 2 |
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, return ns; fail_unconfined: - kzfree(ns->base.name); + kzfree(ns->base.hname); fail_ns: kzfree(ns); return NULL; |