From patchwork Tue Apr 13 07:09:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 50038 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 0F88FB7CF8 for ; Tue, 13 Apr 2010 17:10:16 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1aG9-0005rb-O6; Tue, 13 Apr 2010 08:10:09 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O1aFv-0005fj-TI for kernel-team@lists.ubuntu.com; Tue, 13 Apr 2010 08:09:56 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O1aFv-0003AF-RG; Tue, 13 Apr 2010 08:09:55 +0100 Received: from [96.225.230.137] (helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1O1aFv-0002aa-Fx; Tue, 13 Apr 2010 08:09:55 +0100 From: john.johansen@canonical.com To: kernel-team@lists.ubuntu.com Subject: [PATCH 04/11] AppArmor: fix typo in scrubbing environment variable warning Date: Tue, 13 Apr 2010 00:09:33 -0700 Message-Id: <1271142580-26555-5-git-send-email-john.johansen@canonical.com> X-Mailer: git-send-email 1.7.0 In-Reply-To: <1271142580-26555-1-git-send-email-john.johansen@canonical.com> References: <1271142580-26555-1-git-send-email-john.johansen@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: John Johansen OriginalAuthor: John Johansen 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 Acked-by: Andy Whitcroft --- 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; }