From patchwork Thu Jul 11 08:30:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Johansen X-Patchwork-Id: 258329 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 4C5692C02BF for ; Thu, 11 Jul 2013 18:30:23 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UxCGU-0007YV-K7; Thu, 11 Jul 2013 08:30:14 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UxCGM-0007Y0-26 for kernel-team@lists.ubuntu.com; Thu, 11 Jul 2013 08:30:06 +0000 Received: from static-50-53-37-166.bvtn.or.frontiernet.net ([50.53.37.166] helo=[192.168.192.110]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1UxCGL-0006TS-S3 for kernel-team@lists.ubuntu.com; Thu, 11 Jul 2013 08:30:06 +0000 Message-ID: <51DE6D09.60303@canonical.com> Date: Thu, 11 Jul 2013 01:30:01 -0700 From: John Johansen Organization: Canonical User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130623 Thunderbird/17.0.7 MIME-Version: 1.0 To: Kernel team list Subject: [saucy][PATCH] UBUNTU: SAUCE: (no-up) apparmor: fix apparmor module status for none root users X-Enigmail-Version: 1.4.6 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This fixes a bug in the current apparmor3 alpha2 sync, where none root users can not query whether the apparmor module is enabled. It has been incorporated into the apparmor dev tree and will be integrated as part of the next sync, at which point this patch will be reverted. BugLink: http://bugs.launchpad.net/bugs/1199912 Signed-off-by: John Johansen --- security/apparmor/lsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 28e0734..4e5b340 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -1205,7 +1205,7 @@ module_param_named(paranoid_load, aa_g_paranoid_load, aabool, /* Boot time disable flag */ static bool apparmor_enabled = CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE; -module_param_named(enabled, apparmor_enabled, aabool, S_IRUGO); +module_param_named(enabled, apparmor_enabled, bool, S_IRUGO); /* Boot time to set use of default or unconfined as initial profile */ bool aa_g_unconfined_init = CONFIG_SECURITY_APPARMOR_UNCONFINED_INIT;