]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
APPARMOR: Fix memory leak of alloc_namespace()
authorwzt.wzt@gmail.com <wzt.wzt@gmail.com>
Wed, 10 Nov 2010 03:31:55 +0000 (11:31 +0800)
committerJames Morris <jmorris@namei.org>
Wed, 10 Nov 2010 20:36:18 +0000 (07:36 +1100)
policy->name is a substring of policy->hname, if prefix is not NULL, it will
allocted strlen(prefix) + strlen(name) + 3 bytes to policy->hname in policy_init().
use kzfree(ns->base.name) will casue memory leak if alloc_namespace() failed.

Signed-off-by: Zhitong Wang <zhitong.wangzt@alibaba-inc.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: James Morris <jmorris@namei.org>
security/apparmor/policy.c

index 52cc865f1464574e696fd28eca6a6e0eed326d68..4f0eadee78b8d9295f0da93c32a7321a70055392 100644 (file)
@@ -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;