public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "Serge E. Hallyn" <serge@hallyn.com>
To: Gao feng <gaofeng@cn.fujitsu.com>
Cc: linux-kernel@vger.kernel.org, linux-audit@redhat.com,
	containers@lists.linux-foundation.org, ebiederm@xmission.com,
	serge.hallyn@ubuntu.com, eparis@redhat.com, sgrubb@redhat.com,
	toshi.okajima@jp.fujitsu.com
Subject: Re: [PATCH 18/20] audit: add new message type AUDIT_CREATE_NS
Date: Fri, 6 Dec 2013 22:10:14 +0000	[thread overview]
Message-ID: <20131206221014.GC22445@mail.hallyn.com> (raw)
In-Reply-To: <1382599925-25143-19-git-send-email-gaofeng@cn.fujitsu.com>

Quoting Gao feng (gaofeng@cn.fujitsu.com):
> Since there is no more place for flags of clone system call.
> we need to find a way to create audit namespace.
> 
> this patch add a new type of message AUDIT_CREATE_NS.
> user space can create new audit namespace through
> netlink.
> 
> Right now, The privileged user in user namespace is allowed
> to create audit namespace. it means the unprivileged user can
> create an user namespace and then create audit namespace.
> 
> Looks like it is not safe, but even the unprivileged user can
> create audit namespace, it can do no harm to the host. un-init
> audit namespace cann't effect the host.
> 
> In the follow patches, the audit_backlog_limit will be per
> audit namesapace, but only the privileged user has rights to
> modify it. and the default value of audit_backlog_limit for
> uninit audit namespace will be set to 0.
> 
> And the audit_rate_limit will be limited too.
> 
> Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
> ---
>  include/linux/audit_namespace.h |  7 +++++++
>  include/uapi/linux/audit.h      |  1 +
>  kernel/audit.c                  | 22 ++++++++++++++++++++++
>  kernel/audit_namespace.c        | 29 +++++++++++++++++++++++++++++
>  4 files changed, 59 insertions(+)
> 
> diff --git a/include/linux/audit_namespace.h b/include/linux/audit_namespace.h
> index 79a9b78..b17f052 100644
> --- a/include/linux/audit_namespace.h
> +++ b/include/linux/audit_namespace.h
> @@ -54,6 +54,8 @@ void put_audit_ns(struct audit_namespace *ns)
>  		rcu_read_unlock();
>  	}
>  }
> +
> +extern int unshare_audit_namespace(void);
>  #else
>  static inline
>  struct audit_namespace *get_audit_ns(struct audit_namespace *ns)
> @@ -66,6 +68,11 @@ void put_audit_ns(struct audit_namespace *ns)
>  {
>  
>  }
> +
> +static inline int unshare_audit_namespace()
> +{
> +	return -EINVAL;
> +}
>  #endif
>  
>  static inline struct
> diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h
> index 75cef3f..877d509 100644
> --- a/include/uapi/linux/audit.h
> +++ b/include/uapi/linux/audit.h
> @@ -68,6 +68,7 @@
>  #define AUDIT_MAKE_EQUIV	1015	/* Append to watched tree */
>  #define AUDIT_TTY_GET		1016	/* Get TTY auditing status */
>  #define AUDIT_TTY_SET		1017	/* Set TTY auditing status */
> +#define AUDIT_CREATE_NS		1018	/* Create new audit namespace */
>  
>  #define AUDIT_FIRST_USER_MSG	1100	/* Userspace messages mostly uninteresting to kernel */
>  #define AUDIT_USER_AVC		1107	/* We filter this differently */
> diff --git a/kernel/audit.c b/kernel/audit.c
> index c4d4291..86212d3 100644
> --- a/kernel/audit.c
> +++ b/kernel/audit.c
> @@ -596,6 +596,12 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type)
>  		    !capable(CAP_AUDIT_CONTROL))
>  			err = -EPERM;
>  		break;
> +	case AUDIT_CREATE_NS:
> +		/* Allow privileged user in user namespace to
> +		 * create audit namespace */
> +		if (!ns_capable(current_user_ns(), 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:
> @@ -735,6 +741,22 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
>  		if (status_get->mask & AUDIT_STATUS_BACKLOG_LIMIT)
>  			err = audit_set_backlog_limit(status_get->backlog_limit);
>  		break;
> +	case AUDIT_CREATE_NS:
> +		err = unshare_audit_namespace();
> +
> +		if (audit_enabled == AUDIT_OFF)
> +			break;
> +
> +		ab = audit_log_start_ns(ns, NULL, GFP_KERNEL, AUDIT_CREATE_NS);
> +		if (ab) {
> +			audit_log_format(ab, "Create audit namespace");
> +			audit_log_session_info(ab);
> +			audit_log_task_context(ab);
> +			audit_log_format(ab, "res=%d", err ? 0 : 1);
> +			audit_log_end_ns(ns, ab);
> +		}
> +
> +		break;
>  	case AUDIT_USER:
>  	case AUDIT_FIRST_USER_MSG ... AUDIT_LAST_USER_MSG:
>  	case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2:
> diff --git a/kernel/audit_namespace.c b/kernel/audit_namespace.c
> index 6d9cb8f..28c608e 100644
> --- a/kernel/audit_namespace.c
> +++ b/kernel/audit_namespace.c
> @@ -6,3 +6,32 @@ struct audit_namespace init_audit_ns = {
>  	.user_ns = &init_user_ns,
>  };
>  EXPORT_SYMBOL_GPL(init_audit_ns);
> +
> +int unshare_audit_namespace(void)
> +{
> +	struct task_struct *tsk = current;
> +	struct audit_namespace *new_audit = NULL;
> +	struct nsproxy *new_nsp;
> +
> +	new_audit = kzalloc(sizeof(struct audit_namespace), GFP_KERNEL);
> +	if (!new_audit)
> +		return -ENOMEM;
> +
> +	skb_queue_head_init(&new_audit->queue);
> +	skb_queue_head_init(&new_audit->hold_queue);
> +	init_waitqueue_head(&new_audit->kauditd_wait);
> +	init_waitqueue_head(&new_audit->backlog_wait);
> +
> +	new_nsp = create_new_namespaces(0, tsk, NULL, NULL);
> +	if (IS_ERR(new_nsp)) {
> +		kfree(new_audit);
> +		return PTR_ERR(new_nsp);
> +	}
> +
> +	new_audit->user_ns = get_user_ns(current_user_ns());
> +	new_nsp->audit_ns = get_audit_ns(new_audit);
> +
> +	switch_task_namespaces(current, new_nsp);

Do you need to drop the old audit->ns refcount?

> +
> +	return 0;
> +}
> -- 
> 1.8.3.1
> 
> --
> 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/

  reply	other threads:[~2013-12-06 22:10 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   ` [PATCH 16/20] audit: allow GET, SET, USER " Serge E. Hallyn
2013-12-09  1:47     ` 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 [this message]
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=20131206221014.GC22445@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