From: John Johansen <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit f351841f8d41072e741e45299070d421a5833a4a upstream. Signed-off-by: John Johansen <[email protected]> Acked-by: Seth Arnold <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- security/apparmor/policy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- 2.11.0
