[PATCH 04/11] AppArmor: fix typo in scrubbing environment variable warning

Andy Whitcroft apw at canonical.com
Tue Apr 13 08:58:12 UTC 2010


On Tue, Apr 13, 2010 at 12:09:33AM -0700, john.johansen at canonical.com wrote:
> From: John Johansen <john.johansen at canonical.com>
> 
> OriginalAuthor: John Johansen <john.johansen at canonical.com>
> OriginalLocation: git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparm$
> commit: bc826999a295c82ce54cfec4f8fa580eaa2cd6e5
> BugLink: http://bugs.launchpad.net/bugs/562060
> 
> The debug warning of scrubbing the environment variables is used by
> userspace to detect when exec and permission failures may be caused
> by environment variable scrubbing like when firefox execs java
> as in bug http://bugs.launchpad.net/bugs/484148.  Having it mispelled
> makes it difficult to grep for in the logs.
> 
> Signed-off-by: John Johansen <john.johansen at canonical.com>
> ---
>  security/apparmor/domain.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
> index 7af454f..bf5a739 100644
> --- a/security/apparmor/domain.c
> +++ b/security/apparmor/domain.c
> @@ -452,7 +452,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
>  	 * to avoid having to recompute in secureexec
>  	 */
>  	if (!(sa.perms.xindex & AA_X_UNSAFE)) {
> -		AA_DEBUG("scubbing environment variables for %s profile=%s\n",
> +		AA_DEBUG("scrubbing environment variables for %s profile=%s\n",
>  			 sa.name, new_profile->base.hname);
>  		bprm->unsafe |= AA_SECURE_X_NEEDED;
>  	}
> -- 

Trivial.

Acked-by: Andy Whitcroft <apw at canonical.com>

-apw




More information about the kernel-team mailing list