The audit log that generated in user namespace should be received by the auditd running in this user namespace.
Signed-off-by: Gao feng <[email protected]> --- 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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
