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

[cascardo/linux.git] / net / ipv4 / netfilter / nf_conntrack_l3proto_ipv4_compat.c

diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 91f207c..a460a87 100644 (file)
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -94,7 +94,7 @@ static void ct_seq_stop(struct seq_file *s, void *v)
 }
 
 #ifdef CONFIG_NF_CONNTRACK_SECMARK
-static int ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
+static void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
 {
        int ret;
        u32 len;
@@ -102,17 +102,15 @@ static int ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
 
        ret = security_secid_to_secctx(ct->secmark, &secctx, &len);
        if (ret)
-               return 0;
+               return;
 
-       ret = seq_printf(s, "secctx=%s ", secctx);
+       seq_printf(s, "secctx=%s ", secctx);
 
        security_release_secctx(secctx, len);
-       return ret;
 }
 #else
-static inline int ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
+static inline void ct_show_secctx(struct seq_file *s, const struct nf_conn *ct)
 {
-       return 0;
 }
 #endif
 
@@ -141,11 +139,10 @@ static int ct_seq_show(struct seq_file *s, void *v)
        NF_CT_ASSERT(l4proto);
 
        ret = -ENOSPC;
-       if (seq_printf(s, "%-8s %u %ld ",
-                     l4proto->name, nf_ct_protonum(ct),
-                     timer_pending(&ct->timeout)
-                     ? (long)(ct->timeout.expires - jiffies)/HZ : 0) != 0)
-               goto release;
+       seq_printf(s, "%-8s %u %ld ",
+                  l4proto->name, nf_ct_protonum(ct),
+                  timer_pending(&ct->timeout)
+                  ? (long)(ct->timeout.expires - jiffies)/HZ : 0);
 
        if (l4proto->print_conntrack)
                l4proto->print_conntrack(s, ct);
@@ -153,38 +150,41 @@ static int ct_seq_show(struct seq_file *s, void *v)
        if (seq_has_overflowed(s))
                goto release;
 
-       if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
-                       l3proto, l4proto))
+       print_tuple(s, &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple,
+                   l3proto, l4proto);
+
+       if (seq_has_overflowed(s))
                goto release;
 
        if (seq_print_acct(s, ct, IP_CT_DIR_ORIGINAL))
                goto release;
 
        if (!(test_bit(IPS_SEEN_REPLY_BIT, &ct->status)))
-               if (seq_printf(s, "[UNREPLIED] "))
-                       goto release;
+               seq_printf(s, "[UNREPLIED] ");
+
+       print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple,
+                   l3proto, l4proto);
 
-       if (print_tuple(s, &ct->tuplehash[IP_CT_DIR_REPLY].tuple,
-                       l3proto, l4proto))
+       if (seq_has_overflowed(s))
                goto release;
 
        if (seq_print_acct(s, ct, IP_CT_DIR_REPLY))
                goto release;
 
        if (test_bit(IPS_ASSURED_BIT, &ct->status))
-               if (seq_printf(s, "[ASSURED] "))
-                       goto release;
+               seq_printf(s, "[ASSURED] ");
 
 #ifdef CONFIG_NF_CONNTRACK_MARK
-       if (seq_printf(s, "mark=%u ", ct->mark))
-               goto release;
+       seq_printf(s, "mark=%u ", ct->mark);
 #endif
 
-       if (ct_show_secctx(s, ct))
-               goto release;
+       ct_show_secctx(s, ct);
 
-       if (seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use)))
+       seq_printf(s, "use=%u\n", atomic_read(&ct->ct_general.use));
+
+       if (seq_has_overflowed(s))
                goto release;
+
        ret = 0;
 release:
        nf_ct_put(ct);