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 11/11] netfilter: use ns_printk in iptable context
Date: Wed, 7 Aug 2013 15:37:15 +0800 [thread overview]
Message-ID: <1375861035-24320-12-git-send-email-rui.xiang@huawei.com> (raw)
In-Reply-To: <1375861035-24320-1-git-send-email-rui.xiang@huawei.com>
To containerise iptables log, use ns_printk
to report individual logs to container as
getting syslog_ns from net->user_ns.
Signed-off-by: Rui Xiang <rui.xiang@huawei.com>
---
include/net/netfilter/xt_log.h | 6 +++++-
net/netfilter/xt_LOG.c | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/include/net/netfilter/xt_log.h b/include/net/netfilter/xt_log.h
index 9d9756c..834d972 100644
--- a/include/net/netfilter/xt_log.h
+++ b/include/net/netfilter/xt_log.h
@@ -39,10 +39,14 @@ static struct sbuff *sb_open(void)
return m;
}
-static void sb_close(struct sbuff *m)
+static void sb_close(struct sbuff *m, struct net *net)
{
m->buf[m->count] = 0;
+#ifdef CONFIG_NET_NS
+ ns_printk(net->user_ns->syslog_ns, "%s\n", m->buf);
+#else
printk("%s\n", m->buf);
+#endif
if (likely(m != &emergency))
kfree(m);
diff --git a/net/netfilter/xt_LOG.c b/net/netfilter/xt_LOG.c
index 5ab2484..e034a74 100644
--- a/net/netfilter/xt_LOG.c
+++ b/net/netfilter/xt_LOG.c
@@ -493,7 +493,7 @@ ipt_log_packet(struct net *net,
dump_ipv4_packet(m, loginfo, skb, 0);
- sb_close(m);
+ sb_close(m, net);
}
#if IS_ENABLED(CONFIG_IP6_NF_IPTABLES)
@@ -824,7 +824,7 @@ ip6t_log_packet(struct net *net,
dump_ipv6_packet(m, loginfo, skb, skb_network_offset(skb), 1);
- sb_close(m);
+ sb_close(m, net);
}
#endif
--
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 ` [PATCH v3 09/11] syslog_ns: implement ns_printk_emit " Rui Xiang
2013-08-07 7:37 ` [PATCH v3 10/11] syslog_ns: implement ns_console_unlock " Rui Xiang
2013-08-07 7:37 ` Rui Xiang [this message]
2013-08-07 9:17 ` [PATCH v3 11/11] netfilter: use ns_printk in iptable context 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-12-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®