Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / bridge / netfilter / ebt_log.c

diff --git a/net/bridge/netfilter/ebt_log.c b/net/bridge/netfilter/ebt_log.c
index 92de5e5f9db211fb004a5b8f095c2bd215276682..9878eb8204c524334be49d0445cae9c29927ca0d 100644 (file)
--- a/net/bridge/netfilter/ebt_log.c
+++ b/net/bridge/netfilter/ebt_log.c
@@ -78,6 +78,11 @@ ebt_log_packet(u_int8_t pf, unsigned int hooknum,
    const char *prefix)
 {
        unsigned int bitmask;
+       struct net *net = dev_net(in ? in : out);
+
+       /* FIXME: Disabled from containers until syslog ns is supported */
+       if (!net_eq(net, &init_net))
+               return;
 
        spin_lock_bh(&ebt_log_lock);
        printk(KERN_SOH "%c%s IN=%s OUT=%s MAC source = %pM MAC dest = %pM proto = 0x%04x",
@@ -176,17 +181,18 @@ ebt_log_tg(struct sk_buff *skb, const struct xt_action_param *par)
 {
        const struct ebt_log_info *info = par->targinfo;
        struct nf_loginfo li;
+       struct net *net = dev_net(par->in ? par->in : par->out);
 
        li.type = NF_LOG_TYPE_LOG;
        li.u.log.level = info->loglevel;
        li.u.log.logflags = info->bitmask;
 
        if (info->bitmask & EBT_LOG_NFLOG)
-               nf_log_packet(NFPROTO_BRIDGE, par->hooknum, skb, par->in,
-                             par->out, &li, "%s", info->prefix);
+               nf_log_packet(net, NFPROTO_BRIDGE, par->hooknum, skb,
+                             par->in, par->out, &li, "%s", info->prefix);
        else
                ebt_log_packet(NFPROTO_BRIDGE, par->hooknum, skb, par->in,
-                              par->out, &li, info->prefix);
+                              par->out, &li, info->prefix);
        return EBT_CONTINUE;
 }
 
@@ -206,19 +212,47 @@ static struct nf_logger ebt_log_logger __read_mostly = {
        .me             = THIS_MODULE,
 };
 
+static int __net_init ebt_log_net_init(struct net *net)
+{
+       nf_log_set(net, NFPROTO_BRIDGE, &ebt_log_logger);
+       return 0;
+}
+
+static void __net_exit ebt_log_net_fini(struct net *net)
+{
+       nf_log_unset(net, &ebt_log_logger);
+}
+
+static struct pernet_operations ebt_log_net_ops = {
+       .init = ebt_log_net_init,
+       .exit = ebt_log_net_fini,
+};
+
 static int __init ebt_log_init(void)
 {
        int ret;
 
+       ret = register_pernet_subsys(&ebt_log_net_ops);
+       if (ret < 0)
+               goto err_pernet;
+
        ret = xt_register_target(&ebt_log_tg_reg);
        if (ret < 0)
-               return ret;
+               goto err_target;
+
        nf_log_register(NFPROTO_BRIDGE, &ebt_log_logger);
-       return 0;
+
+       return ret;
+
+err_target:
+       unregister_pernet_subsys(&ebt_log_net_ops);
+err_pernet:
+       return ret;
 }
 
 static void __exit ebt_log_fini(void)
 {
+       unregister_pernet_subsys(&ebt_log_net_ops);
        nf_log_unregister(&ebt_log_logger);
        xt_unregister_target(&ebt_log_tg_reg);
 }