projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6059f71
)
apparmor: fix put() parent ref after updating the active ref
author
John Johansen
<john.johansen@canonical.com>
Sat, 16 Apr 2016 20:59:02 +0000
(13:59 -0700)
committer
John Johansen
<john.johansen@canonical.com>
Tue, 12 Jul 2016 15:43:10 +0000
(08:43 -0700)
Signed-off-by: John Johansen <john.johansen@canonical.com>
Acked-by: Seth Arnold <seth.arnold@canonical.com>
security/apparmor/policy.c
patch
|
blob
|
history
diff --git
a/security/apparmor/policy.c
b/security/apparmor/policy.c
index
c92a9f6
..
455c9f8
100644
(file)
--- 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,