From: Rui Xiang <rui.xiang@huawei.com>
To: <containers@lists.linux-foundation.org>, <linux-kernel@vger.kernel.org>
Cc: <netdev@vger.kernel.org>, <netfilter-devel@vger.kernel.org>,
<serge.hallyn@ubuntu.com>, <ebiederm@xmission.com>,
<akpm@linux-foundation.org>, <gaofeng@cn.fujitsu.com>,
<guz.fnst@cn.fujitsu.com>, <libo.chen@huawei.com>,
Rui Xiang <rui.xiang@huawei.com>
Subject: [PATCH v3 09/11] syslog_ns: implement ns_printk_emit for specific syslog_ns
Date: Wed, 7 Aug 2013 15:37:13 +0800 [thread overview]
Message-ID: <1375861035-24320-10-git-send-email-rui.xiang@huawei.com> (raw)
In-Reply-To: <1375861035-24320-1-git-send-email-rui.xiang@huawei.com>
Prink_emit use init_syslog_ns as a parameter of namespace,
but in some context, it will cause that logs generated
through printk_emit will be exported to host, for instance,
devkmsg_writev.
We add a new interface ns_printk_emit to pass an syslog_ns
parameter, and use it in devkmsg_writev.
Signed-off-by: Rui Xiang <rui.xiang@huawei.com>
---
include/linux/printk.h | 6 ++++++
kernel/printk.c | 20 +++++++++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/include/linux/printk.h b/include/linux/printk.h
index bf83ad9..4c7e2be 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -121,6 +121,12 @@ asmlinkage int printk_emit(int facility, int level,
const char *dict, size_t dictlen,
const char *fmt, ...);
+asmlinkage __printf(6, 7) __cold
+asmlinkage int ns_printk_emit(struct syslog_namespace *ns,
+ int facility, int level,
+ const char *dict, size_t dictlen,
+ const char *fmt, ...);
+
asmlinkage __printf(1, 2) __cold
int printk(const char *fmt, ...);
diff --git a/kernel/printk.c b/kernel/printk.c
index 38e8869..b60c1d4 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -420,6 +420,7 @@ static ssize_t devkmsg_writev(struct kiocb *iocb, const struct iovec *iv,
int facility = 1; /* LOG_USER */
size_t len = iov_length(iv, count);
ssize_t ret = len;
+ struct namespace *ns = current_user_ns()->syslog_ns;
if (len > LOG_LINE_MAX)
return -EINVAL;
@@ -461,7 +462,7 @@ static ssize_t devkmsg_writev(struct kiocb *iocb, const struct iovec *iv,
}
line[len] = '\0';
- printk_emit(facility, level, NULL, 0, "%s", line);
+ ns_printk_emit(ns, facility, level, NULL, 0, "%s", line);
out:
kfree(buf);
return ret;
@@ -1722,6 +1723,23 @@ asmlinkage int printk_emit(int facility, int level,
}
EXPORT_SYMBOL(printk_emit);
+asmlinkage int ns_printk_emit(struct syslog_namespace *ns,
+ int facility, int level,
+ const char *dict, size_t dictlen,
+ const char *fmt, ...)
+{
+ va_list args;
+ int r;
+
+ va_start(args, fmt);
+ r = ns_vprintk_emit(ns, facility, level, dict, dictlen, fmt,
+ args);
+ va_end(args);
+
+ return r;
+}
+EXPORT_SYMBOL(ns_printk_emit);
+
/**
* printk - print a kernel message
* @fmt: format string
--
1.8.2.2
next prev parent reply other threads:[~2013-08-07 7:38 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 7:37 [PATCH v3 00/11] Add namespace support for syslog Rui Xiang
2013-08-07 7:37 ` [PATCH v3 01/11] syslog_ns: add syslog_namespace and put/get_syslog_ns Rui Xiang
2013-08-07 7:37 ` [PATCH v3 02/11] syslog_ns: add syslog_ns into user_namespace Rui Xiang
2013-08-07 7:37 ` [PATCH v3 03/11] syslog_ns: add init syslog_ns for global syslog Rui Xiang
2013-08-07 7:37 ` [PATCH v3 04/11] syslog_ns: make syslog handling per namespace Rui Xiang
2013-08-07 18:52 ` Ben Hutchings
2013-08-07 7:37 ` [PATCH v3 05/11] syslog_ns: make permisiion check per user namespace Rui Xiang
2013-08-07 18:41 ` Ben Hutchings
2013-08-07 7:37 ` [PATCH v3 06/11] syslog_ns: use init syslog_ns for console action Rui Xiang
2013-08-07 7:37 ` [PATCH v3 07/11] syslog_ns: implement function for creating syslog ns Rui Xiang
2013-08-07 18:59 ` Ben Hutchings
2013-08-07 7:37 ` [PATCH v3 08/11] syslog_ns: implement ns_printk for specific syslog_ns Rui Xiang
2013-08-07 7:37 ` Rui Xiang [this message]
2013-08-07 7:37 ` [PATCH v3 10/11] syslog_ns: implement ns_console_unlock " Rui Xiang
2013-08-07 7:37 ` [PATCH v3 11/11] netfilter: use ns_printk in iptable context Rui Xiang
2013-08-07 9:17 ` Pablo Neira Ayuso
2013-08-07 7:55 ` [PATCH v3 00/11] Add namespace support for syslog Eric W. Biederman
2013-08-07 13:48 ` Serge Hallyn
2013-08-08 1:37 ` Gao feng
2013-08-08 11:13 ` Rui Xiang
2013-08-14 15:30 ` Serge E. Hallyn
2013-08-14 19:21 ` Eric W. Biederman
2013-08-17 13:38 ` Serge E. Hallyn
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=1375861035-24320-10-git-send-email-rui.xiang@huawei.com \
--to=rui.xiang@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=gaofeng@cn.fujitsu.com \
--cc=guz.fnst@cn.fujitsu.com \
--cc=libo.chen@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=serge.hallyn@ubuntu.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
all inboxes | Powered by JetHome®