Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934290Ab3FSByF (ORCPT ); Tue, 18 Jun 2013 21:54:05 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:45515 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S934099Ab3FSBxN (ORCPT ); Tue, 18 Jun 2013 21:53:13 -0400 X-IronPort-AV: E=Sophos;i="4.87,893,1363104000"; d="scan'208";a="7596304" From: Gao feng To: containers@lists.linux-foundation.org, linux-audit@redhat.com, linux-kernel@vger.kernel.org Cc: eparis@redhat.com, serge.hallyn@ubuntu.com, ebiederm@xmission.com, sgrubb@redhat.com, aris@redhat.com, matthltc@linux.vnet.ibm.com, Gao feng Subject: [PATCH 19/22] Audit: pass proper user namespace to audit_log_common_recv_msg Date: Wed, 19 Jun 2013 09:53:51 +0800 Message-Id: <1371606834-5802-20-git-send-email-gaofeng@cn.fujitsu.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1371606834-5802-1-git-send-email-gaofeng@cn.fujitsu.com> References: <1371606834-5802-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/06/19 09:51:57, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/06/19 09:52:03, Serialize complete at 2013/06/19 09:52:03 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3494 Lines: 104 The audit log that generated in user namespace should be received by the auditd running in this user namespace. Signed-off-by: Gao feng --- kernel/audit.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/kernel/audit.c b/kernel/audit.c index 5d3764c..2d81aac 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -624,17 +624,18 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type) return err; } -static int audit_log_common_recv_msg(struct audit_buffer **ab, u16 msg_type) +static int audit_log_common_recv_msg(struct user_namespace *ns, + struct audit_buffer **ab, u16 msg_type) { int rc = 0; - uid_t uid = from_kuid(&init_user_ns, current_uid()); + uid_t uid = from_kuid(ns, current_uid()); - if (!audit_enabled_ns(&init_user_ns)) { + if (!audit_enabled_ns(ns)) { *ab = NULL; return rc; } - *ab = audit_log_start(NULL, GFP_KERNEL, msg_type); + *ab = audit_log_start_ns(ns, NULL, GFP_KERNEL, msg_type); if (unlikely(!*ab)) return rc; audit_log_format(*ab, "pid=%d uid=%u", task_tgid_vnr(current), uid); @@ -737,7 +738,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) if (err) break; } - audit_log_common_recv_msg(&ab, msg_type); + audit_log_common_recv_msg(ns, &ab, msg_type); if (msg_type != AUDIT_USER_TTY) audit_log_format(ab, " msg='%.1024s'", (char *)data); @@ -752,7 +753,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) audit_log_n_untrustedstring(ab, data, size); } audit_set_pid(ab, NETLINK_CB(skb).portid); - audit_log_end(ab); + audit_log_end_ns(ns, ab); } break; case AUDIT_ADD_RULE: @@ -760,10 +761,11 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) if (nlmsg_len(nlh) < sizeof(struct audit_rule_data)) return -EINVAL; if (ns->audit.enabled == AUDIT_LOCKED) { - audit_log_common_recv_msg(&ab, AUDIT_CONFIG_CHANGE); + audit_log_common_recv_msg(ns, &ab, + AUDIT_CONFIG_CHANGE); audit_log_format(ab, " audit_enabled=%d res=0", ns->audit.enabled); - audit_log_end(ab); + audit_log_end_ns(ns, ab); return -EPERM; } /* fallthrough */ @@ -773,9 +775,9 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) break; case AUDIT_TRIM: audit_trim_trees(); - audit_log_common_recv_msg(&ab, AUDIT_CONFIG_CHANGE); + audit_log_common_recv_msg(ns, &ab, AUDIT_CONFIG_CHANGE); audit_log_format(ab, " op=trim res=1"); - audit_log_end(ab); + audit_log_end_ns(ns, ab); break; case AUDIT_MAKE_EQUIV: { void *bufp = data; @@ -803,14 +805,14 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh) /* OK, here comes... */ err = audit_tag_tree(old, new); - audit_log_common_recv_msg(&ab, AUDIT_CONFIG_CHANGE); + audit_log_common_recv_msg(ns, &ab, AUDIT_CONFIG_CHANGE); audit_log_format(ab, " op=make_equiv old="); audit_log_untrustedstring(ab, old); audit_log_format(ab, " new="); audit_log_untrustedstring(ab, new); audit_log_format(ab, " res=%d", !err); - audit_log_end(ab); + audit_log_end_ns(ns, ab); kfree(old); kfree(new); break; -- 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/