diff options
| author | John Johansen <john.johansen@canonical.com> | 2016-04-16 22:59:02 +0200 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2016-07-12 17:43:10 +0200 |
| commit | f351841f8d41072e741e45299070d421a5833a4a (patch) | |
| tree | ba9ea8ffed6de142bc1eb814e93f5509bdde50ca | |
| parent | apparmor: add parameter to control whether policy hashing is used (diff) | |
| download | linux-f351841f8d41072e741e45299070d421a5833a4a.tar.xz linux-f351841f8d41072e741e45299070d421a5833a4a.zip | |
apparmor: fix put() parent ref after updating the active ref
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
| -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 c92a9f6c1be5..455c9f89f7e2 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c @@ -1187,8 +1187,8 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace) /* parent replaced in this atomic set? */ if (newest != parent) { aa_get_profile(newest); - aa_put_profile(parent); rcu_assign_pointer(ent->new->parent, newest); + aa_put_profile(parent); } /* aafs interface uses replacedby */ rcu_assign_pointer(ent->new->replacedby->profile, |