aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNavid Emamdoost <navid.emamdoost@gmail.com>2019-10-21 10:23:47 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2020-06-04 16:28:48 -0400
commit4794ff4ee1e895b95f3453264fe3a170991d2e30 (patch)
tree6df31696f31b10eb889c924e0bc61adc02a769aa
parent4ad5fbf67e7f1b430407b58e1c97a304f2a9db94 (diff)
downloadlinux-yocto-4794ff4ee1e895b95f3453264fe3a170991d2e30.tar.gz
linux-yocto-4794ff4ee1e895b95f3453264fe3a170991d2e30.tar.bz2
linux-yocto-4794ff4ee1e895b95f3453264fe3a170991d2e30.zip
apparmor: Fix use-after-free in aa_audit_rule_init
commit c54d481d71c6849e044690d3960aaebc730224cc upstream. In the implementation of aa_audit_rule_init(), when aa_label_parse() fails the allocated memory for rule is released using aa_audit_rule_free(). But after this release, the return statement tries to access the label field of the rule which results in use-after-free. Before releasing the rule, copy errNo and return it after release. Fixes: 52e8c38001d8 ("apparmor: Fix memory leak of rule on error exit path") Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--security/apparmor/audit.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
index 5a98661a8b46..597732503815 100644
--- a/security/apparmor/audit.c
+++ b/security/apparmor/audit.c
@@ -197,8 +197,9 @@ int aa_audit_rule_init(u32 field, u32 op, char *rulestr, void **vrule)
rule->label = aa_label_parse(&root_ns->unconfined->label, rulestr,
GFP_KERNEL, true, false);
if (IS_ERR(rule->label)) {
+ int err = PTR_ERR(rule->label);
aa_audit_rule_free(rule);
- return PTR_ERR(rule->label);
+ return err;
}
*vrule = rule;