[apparmor] [PATCH 01/16] apparmor: fix refcount bug in profile replacement

[Seth Arnold]

On Wed, Apr 20, 2016 at 11:52:43PM -0700, John Johansen wrote:
> Signed-off-by: John Johansen <john.johansen at canonical.com>

Acked-by: Seth Arnold <seth.arnold at canonical.com>

Thanks

> ---
>  security/apparmor/policy.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
> index 705c287..222052f 100644
> --- a/security/apparmor/policy.c
> +++ b/security/apparmor/policy.c
> @@ -1189,12 +1189,12 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
>  				aa_get_profile(newest);
>  				aa_put_profile(parent);
>  				rcu_assign_pointer(ent->new->parent, newest);
> -			} else
> -				aa_put_profile(newest);
> +			}
>  			/* aafs interface uses replacedby */
>  			rcu_assign_pointer(ent->new->replacedby->profile,
>  					   aa_get_profile(ent->new));
>  			__list_add_profile(&parent->base.profiles, ent->new);
> +			aa_put_profile(newest);
>  		} else {
>  			/* aafs interface uses replacedby */
>  			rcu_assign_pointer(ent->new->replacedby->profile,
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <https://lists.ubuntu.com/archives/apparmor/attachments/20160426/b1cf8071/attachment.pgp>