From: "Serge E. Hallyn" <serge@hallyn.com>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: linux-kernel@vger.kernel.org, linux-audit@redhat.com,
toshi.okajima@jp.fujitsu.com,
containers@lists.linux-foundation.org, serge.hallyn@ubuntu.com,
eparis@redhat.com, ebiederm@xmission.com, sgrubb@redhat.com
Subject: Re: [PATCH 16/20] audit: allow GET, SET, USER MSG operations in audit namespace
Date: Fri, 6 Dec 2013 22:00:34 +0000 [thread overview]
Message-ID: <20131206220033.GB22445@mail.hallyn.com> (raw)
In-Reply-To: <1382599925-25143-17-git-send-email-gaofeng@cn.fujitsu.com>
Quoting Gao feng (gaofeng@cn.fujitsu.com):
> 1, remove the permission check of pid namespace. it's no reason
> to deny un-init pid namespace to operate audit subsystem.
>
> 2, only allow init user namespace and init audit namespace to
> operate list/add/del rule, tty set, trim, make equiv operations.
>
> 3, allow audit namespace to get/set audit configuration, send
> userspace audit message.
>
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
> kernel/audit.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/kernel/audit.c b/kernel/audit.c
> index 095f54d..c4d4291 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -573,11 +573,7 @@ out:
> static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
> {
> int err = 0;
> -
> - /* Only support the initial namespaces for now. */
> - if ((current_user_ns() != &init_user_ns) ||
> - (task_active_pid_ns(current) != &init_pid_ns))
> - return -EPERM;
> + struct audit_namespace *ns = current->nsproxy->audit_ns;
>
> switch (msg_type) {
> case AUDIT_LIST:
> @@ -586,6 +582,7 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
> return -EOPNOTSUPP;
> case AUDIT_GET:
> case AUDIT_SET:
> + break;
So, these AUDIT_SET and AUDIT_GET go from requiring CAP_AUDIT_CONTROL
to not needing any privs at all?
> case AUDIT_LIST_RULES:
> case AUDIT_ADD_RULE:
> case AUDIT_DEL_RULE:
> @@ -594,13 +591,15 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
> case AUDIT_TTY_SET:
> case AUDIT_TRIM:
> case AUDIT_MAKE_EQUIV:
> - if (!capable(CAP_AUDIT_CONTROL))
> + if ((current_user_ns() != &init_user_ns) ||
> + (ns != &init_audit_ns) ||
> + !capable(CAP_AUDIT_CONTROL))
> err = -EPERM;
> break;
> case AUDIT_USER:
> case AUDIT_FIRST_USER_MSG ... AUDIT_LAST_USER_MSG:
> case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2:
> - if (!capable(CAP_AUDIT_WRITE))
> + if (!ns_capable(ns->user_ns, CAP_AUDIT_WRITE))
> err = -EPERM;
> break;
> default: /* bad msg */
> --
> 1.8.3.1
>
> _______________________________________________
> Containers mailing list
> Containers@lists.linux-foundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/containers
next prev parent reply other threads:[~2013-12-06 22:00 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-24 7:31 [RFC Part1 PATCH 00/20 v2] Add namespace support for audit Gao feng
2013-10-24 7:31 ` [PATCH 01/20] Audit: make audit netlink socket net namespace unaware Gao feng
2013-10-24 7:31 ` [PATCH 02/20] audit: introduce configure option CONFIG_AUDIT_NS Gao feng
2013-10-24 7:31 ` [PATCH 03/20] audit: make audit_skb_queue per audit namespace Gao feng
2013-10-24 7:31 ` [PATCH 04/20] audit: make audit_skb_hold_queue " Gao feng
2013-10-24 7:31 ` [PATCH 05/20] audit: make audit_pid " Gao feng
2013-10-24 7:31 ` [PATCH 06/20] audit: make kauditd_task " Gao feng
2013-10-24 7:31 ` [PATCH 07/20] aduit: make audit_nlk_portid " Gao feng
2013-10-24 7:31 ` [PATCH 08/20] audit: make kaudit_wait queue " Gao feng
2013-10-24 7:31 ` [PATCH 09/20] audit: make audit_backlog_wait " Gao feng
2013-10-24 7:31 ` [PATCH 10/20] audit: allow un-init audit ns to change pid and portid only Gao feng
2013-10-24 7:31 ` [PATCH 11/20] audit: use proper audit namespace in audit_receive_msg Gao feng
2013-10-24 7:31 ` [PATCH 12/20] audit: use proper audit_namespace in kauditd_thread Gao feng
2013-10-24 7:31 ` [PATCH 13/20] audit: introduce new audit logging interface for audit namespace Gao feng
2013-10-24 7:31 ` [PATCH 14/20] audit: pass proper audit namespace to audit_log_common_recv_msg Gao feng
2013-10-24 7:32 ` [PATCH 15/20] audit: Log audit pid config change in audit namespace Gao feng
2013-10-24 7:32 ` [PATCH 16/20] audit: allow GET,SET,USER MSG operations " Gao feng
2013-12-06 22:00 ` Serge E. Hallyn [this message]
2013-12-09 1:47 ` [PATCH 16/20] audit: allow GET, SET, USER " Gao feng
2013-10-24 7:32 ` [PATCH 17/20] nsproxy: don't make create_new_namespaces static Gao feng
2013-10-24 7:32 ` [PATCH 18/20] audit: add new message type AUDIT_CREATE_NS Gao feng
2013-12-06 22:10 ` Serge E. Hallyn
2013-12-09 1:59 ` Gao feng
2013-12-09 17:53 ` Serge Hallyn
2013-12-10 5:34 ` Gao feng
2013-10-24 7:32 ` [PATCH 19/20] audit: make audit_backlog_limit per audit namespace Gao feng
2013-10-24 7:32 ` [PATCH 20/20] audit: introduce /proc/<pid>/audit_backlog_limit Gao feng
2013-10-31 3:52 ` [RFC Part1 PATCH 00/20 v2] Add namespace support for audit Gao feng
2013-11-05 7:51 ` Gao feng
2013-11-05 7:52 ` Gao feng
2013-11-05 8:11 ` Li Zefan
2013-11-05 8:56 ` Gao feng
2013-11-05 19:14 ` Richard Guy Briggs
2013-11-07 5:51 ` Gao feng
2013-11-21 7:57 ` Gao feng
2013-12-04 8:31 ` Gao feng
2013-12-06 22:12 ` Serge E. Hallyn
2013-12-09 2:06 ` Gao feng
2013-12-09 18:26 ` Serge Hallyn
2013-12-10 8:16 ` Gao feng
2013-12-10 16:51 ` Serge Hallyn
2013-12-10 19:50 ` Eric Paris
2013-12-10 20:36 ` Serge E. Hallyn
2013-12-16 3:39 ` Gao feng
2013-12-20 21:15 ` Serge E. Hallyn
2013-12-24 9:32 ` Gao feng
2013-12-06 21:31 ` Serge E. Hallyn
2013-12-09 2:29 ` Gao feng
2013-12-23 23:47 ` Richard Guy Briggs
2013-12-24 9:53 ` Gao feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131206220033.GB22445@mail.hallyn.com \
--to=serge@hallyn.com \
--cc=containers@lists.linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=eparis@redhat.com \
--cc=gaofeng@cn.fujitsu.com \
--cc=linux-audit@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=serge.hallyn@ubuntu.com \
--cc=sgrubb@redhat.com \
--cc=toshi.okajima@jp.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).