diff options
| author | Navid Emamdoost <navid.emamdoost@gmail.com> | 2019-10-21 18:23:47 +0300 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2020-05-22 01:25:51 +0300 |
| commit | c54d481d71c6849e044690d3960aaebc730224cc (patch) | |
| tree | d43fe9636bb5c992caead0e29a7aba02c2b3dbec /security/apparmor | |
| parent | c6b39f070722ea9963ffe756bfe94e89218c5e63 (diff) | |
| download | linux-c54d481d71c6849e044690d3960aaebc730224cc.tar.xz | |
apparmor: Fix use-after-free in aa_audit_rule_init
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>
Diffstat (limited to 'security/apparmor')
| -rw-r--r-- | security/apparmor/audit.c | 3 |
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; |