[apparmor] [PATCH 03/15] apparmor: fix profile lookup for unconfined

[John Johansen]

On 07/12/2012 12:46 PM, Seth Arnold wrote:
> This looks like it duplicates the block above. Is this a mis-constructed patch?
> 
oops, sorry I meant to drop that patch as its already been pushed upstream


> -----Original Message-----
> From: John Johansen <john.johansen at canonical.com>
> Sender: apparmor-bounces at lists.ubuntu.com
> Date: Thu, 12 Jul 2012 12:04:59 
> To: <apparmor at lists.ubuntu.com>
> Subject: [apparmor] [PATCH 03/15] apparmor: fix profile lookup for unconfined
> 
> BugLink: http://bugs.launchpad.net/bugs/978038
> 
> also affects apparmor portion of
> BugLink: http://bugs.launchpad.net/bugs/987371
> 
> The unconfined profile is not stored in the regular profile list, but
> change_profile and exec transitions may want access to it when setting
> up specialized transitions like switch to the unconfined profile of a
> new policy namespace.
> 
> Signed-off-by: John Johansen <john.johansen at canonical.com>
> ---
>  security/apparmor/policy.c |    4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
> index cf5fd22..aa4f64f 100644
> --- a/security/apparmor/policy.c
> +++ b/security/apparmor/policy.c
> @@ -907,6 +907,10 @@ struct aa_profile *aa_lookup_profile(struct aa_namespace *ns, const char *hname)
>  	if (!profile && strcmp(hname, "unconfined") == 0)
>  		profile = aa_get_profile(ns->unconfined);
>  
> +	/* the unconfined profile is not in the regular profile list */
> +	if (!profile && strcmp(hname, "unconfined") == 0)
> +		profile = aa_get_profile(ns->unconfined);
> +
>  	/* refcount released by caller */
>  	return profile;
>  }
>