Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933759Ab3EGCX0 (ORCPT ); Mon, 6 May 2013 22:23:26 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:15985 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S933320Ab3EGCTe (ORCPT ); Mon, 6 May 2013 22:19:34 -0400 X-IronPort-AV: E=Sophos;i="4.87,625,1363104000"; d="scan'208";a="7201790" From: Gao feng To: viro@zeniv.linux.org.uk, eparis@redhat.com, ebiederm@xmission.com, sgrubb@redhat.com, akpm@linux-foundation.org, serge.hallyn@ubuntu.com, davem@davemloft.net Cc: netdev@vger.kernel.org, containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org, linux-audit@redhat.com, Gao feng Subject: [PATCH RFC 45/48] Audit: user audit_enabled_ns to replace audit_enabled Date: Tue, 7 May 2013 10:21:06 +0800 Message-Id: <1367893269-9308-46-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1367893269-9308-1-git-send-email-gaofeng@cn.fujitsu.com> References: <1367893269-9308-1-git-send-email-gaofeng@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/07 10:18:29, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/07 10:18:31, Serialize complete at 2013/05/07 10:18:31 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2536 Lines: 80 We should use the proper user namespace's audit.enabled, not the init_user_ns's audit.enabled. Signed-off-by: Gao feng --- drivers/tty/tty_audit.c | 4 ++-- kernel/auditsc.c | 2 +- net/core/dev.c | 2 +- security/apparmor/lib.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c index 7dfa931..f2d6811 100644 --- a/drivers/tty/tty_audit.c +++ b/drivers/tty/tty_audit.c @@ -99,7 +99,7 @@ static void tty_audit_buf_push(struct task_struct *tsk, kuid_t loginuid, { if (buf->valid == 0) return; - if (audit_enabled == 0) { + if (audit_enabled_ns(task_cred_xxx(tsk, user_ns)) == 0) { buf->valid = 0; return; } @@ -182,7 +182,7 @@ void tty_audit_tiocsti(struct tty_struct *tty, char ch) tty_audit_buf_put(buf); } - if (should_audit && audit_enabled) { + if (should_audit && audit_enabled_ns(current_user_ns())) { kuid_t auid; unsigned int sessionid; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index a65020a..e579b75 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1782,7 +1782,7 @@ void __audit_syscall_entry(int arch, int major, BUG_ON(context->in_syscall || context->name_count); - if (!audit_enabled) + if (!audit_enabled_ns(ns)) return; context->arch = arch; diff --git a/net/core/dev.c b/net/core/dev.c index 40b1fad..651ad69 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -4458,7 +4458,7 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc) pr_info("device %s %s promiscuous mode\n", dev->name, dev->flags & IFF_PROMISC ? "entered" : "left"); - if (audit_enabled) { + if (audit_enabled_ns(current_user_ns())) { current_uid_gid(&uid, &gid); audit_log(current->audit_context, GFP_ATOMIC, AUDIT_ANOM_PROMISCUOUS, diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c index 7430298..9cae5ce 100644 --- a/security/apparmor/lib.c +++ b/security/apparmor/lib.c @@ -63,7 +63,7 @@ char *aa_split_fqname(char *fqname, char **ns_name) */ void aa_info_message(const char *str) { - if (audit_enabled) { + if (audit_enabled_ns(current_user_ns())) { struct common_audit_data sa; struct apparmor_audit_data aad = {0,}; sa.type = LSM_AUDIT_DATA_NONE; -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/