From: Gao feng <gaofeng@cn.fujitsu.com>
To: linux-kernel@vger.kernel.org, linux-audit@redhat.com
Cc: containers@lists.linux-foundation.org, ebiederm@xmission.com,
serge.hallyn@ubuntu.com, eparis@redhat.com, sgrubb@redhat.com,
toshi.okajima@jp.fujitsu.com, Gao feng <gaofeng@cn.fujitsu.com>
Subject: [PATCH 08/20] audit: make kaudit_wait queue per audit namespace
Date: Thu, 24 Oct 2013 15:31:53 +0800 [thread overview]
Message-ID: <1382599925-25143-9-git-send-email-gaofeng@cn.fujitsu.com> (raw)
In-Reply-To: <1382599925-25143-1-git-send-email-gaofeng@cn.fujitsu.com>
kauditd_task is added to the wait queue kaudit_wait when
there is no audit message being generated in audit namespace,
so the kaudit_wait should be per audit namespace too.
Signed-off-by: Gao feng <gaofeng@cn.fujitsu.com>
---
include/linux/audit_namespace.h | 2 ++
kernel/audit.c | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/linux/audit_namespace.h b/include/linux/audit_namespace.h
index a9e6a40..2888238 100644
--- a/include/linux/audit_namespace.h
+++ b/include/linux/audit_namespace.h
@@ -4,6 +4,7 @@
#include <linux/audit.h>
#include <linux/atomic.h>
#include <linux/slab.h>
+#include <linux/wait.h>
#include <linux/skbuff.h>
#include <linux/user_namespace.h>
@@ -18,6 +19,7 @@ struct audit_namespace {
/* queue of skbs to send to auditd when/if it comes back */
struct sk_buff_head hold_queue;
struct task_struct *kauditd_task;
+ wait_queue_head_t kauditd_wait;
};
extern struct audit_namespace init_audit_ns;
diff --git a/kernel/audit.c b/kernel/audit.c
index 37375fb..a4bfd7f 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -126,7 +126,6 @@ static DEFINE_SPINLOCK(audit_freelist_lock);
static int audit_freelist_count;
static LIST_HEAD(audit_freelist);
-static DECLARE_WAIT_QUEUE_HEAD(kauditd_wait);
static DECLARE_WAIT_QUEUE_HEAD(audit_backlog_wait);
/* Serialize requests from userspace. */
@@ -453,7 +452,7 @@ static int kauditd_thread(void *dummy)
continue;
}
set_current_state(TASK_INTERRUPTIBLE);
- add_wait_queue(&kauditd_wait, &wait);
+ add_wait_queue(&init_audit_ns.kauditd_wait, &wait);
if (!skb_queue_len(&ns->queue)) {
try_to_freeze();
@@ -461,7 +460,7 @@ static int kauditd_thread(void *dummy)
}
__set_current_state(TASK_RUNNING);
- remove_wait_queue(&kauditd_wait, &wait);
+ remove_wait_queue(&init_audit_ns.kauditd_wait, &wait);
}
ns->kauditd_task = NULL;
@@ -941,6 +940,7 @@ static int __init audit_init(void)
init_audit_ns.kauditd_task = NULL;
skb_queue_head_init(&init_audit_ns.queue);
skb_queue_head_init(&init_audit_ns.hold_queue);
+ init_waitqueue_head(&init_audit_ns.kauditd_wait);
audit_initialized = AUDIT_INITIALIZED;
audit_enabled = audit_default;
audit_ever_enabled |= !!audit_default;
@@ -1706,7 +1706,7 @@ void audit_log_end(struct audit_buffer *ab)
if (init_audit_ns.pid) {
skb_queue_tail(&init_audit_ns.queue, ab->skb);
- wake_up_interruptible(&kauditd_wait);
+ wake_up_interruptible(&init_audit_ns.kauditd_wait);
} else {
audit_printk_skb(ab->skb);
}
--
1.8.3.1
next prev parent reply other threads:[~2013-10-24 7:31 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 ` Gao feng [this message]
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
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=1382599925-25143-9-git-send-email-gaofeng@cn.fujitsu.com \
--to=gaofeng@cn.fujitsu.com \
--cc=containers@lists.linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=eparis@redhat.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).