aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/ipv4/netfilter/ip_tables.c6
-rw-r--r--net/ipv4/netfilter/ipt_SYNPROXY.c2
-rw-r--r--net/ipv4/netfilter/iptable_security.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
index 3991a87ddeaa..b99affad6ba1 100644
--- a/net/ipv4/netfilter/ip_tables.c
+++ b/net/ipv4/netfilter/ip_tables.c
@@ -431,8 +431,8 @@ ipt_do_table(struct sk_buff *skb,
431 } while (!acpar.hotdrop); 431 } while (!acpar.hotdrop);
432 pr_debug("Exiting %s; sp at %u\n", __func__, stackidx); 432 pr_debug("Exiting %s; sp at %u\n", __func__, stackidx);
433 433
434 xt_write_recseq_end(addend); 434 xt_write_recseq_end(addend);
435 local_bh_enable(); 435 local_bh_enable();
436 436
437#ifdef DEBUG_ALLOW_ALL 437#ifdef DEBUG_ALLOW_ALL
438 return NF_ACCEPT; 438 return NF_ACCEPT;
@@ -484,7 +484,7 @@ mark_source_chains(const struct xt_table_info *newinfo,
484 unsigned int oldpos, size; 484 unsigned int oldpos, size;
485 485
486 if ((strcmp(t->target.u.user.name, 486 if ((strcmp(t->target.u.user.name,
487 XT_STANDARD_TARGET) == 0) && 487 XT_STANDARD_TARGET) == 0) &&
488 t->verdict < -NF_MAX_VERDICT - 1) { 488 t->verdict < -NF_MAX_VERDICT - 1) {
489 duprintf("mark_source_chains: bad " 489 duprintf("mark_source_chains: bad "
490 "negative verdict (%i)\n", 490 "negative verdict (%i)\n",
diff --git a/net/ipv4/netfilter/ipt_SYNPROXY.c b/net/ipv4/netfilter/ipt_SYNPROXY.c
index f105b6ffe351..a1058363d2e9 100644
--- a/net/ipv4/netfilter/ipt_SYNPROXY.c
+++ b/net/ipv4/netfilter/ipt_SYNPROXY.c
@@ -231,7 +231,7 @@ synproxy_send_client_ack(const struct synproxy_net *snet,
231 synproxy_build_options(nth, opts); 231 synproxy_build_options(nth, opts);
232 232
233 synproxy_send_tcp(snet, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY, 233 synproxy_send_tcp(snet, skb, nskb, skb->nfct, IP_CT_ESTABLISHED_REPLY,
234 niph, nth, tcp_hdr_size); 234 niph, nth, tcp_hdr_size);
235} 235}
236 236
237static bool 237static bool
diff --git a/net/ipv4/netfilter/iptable_security.c b/net/ipv4/netfilter/iptable_security.c
index f534e2f05bad..c2e23d5e9cd4 100644
--- a/net/ipv4/netfilter/iptable_security.c
+++ b/net/ipv4/netfilter/iptable_security.c
@@ -79,7 +79,7 @@ static int __init iptable_security_init(void)
79 int ret; 79 int ret;
80 80
81 ret = register_pernet_subsys(&iptable_security_net_ops); 81 ret = register_pernet_subsys(&iptable_security_net_ops);
82 if (ret < 0) 82 if (ret < 0)
83 return ret; 83 return ret;
84 84
85 sectbl_ops = xt_hook_link(&security_table, iptable_security_hook); 85 sectbl_ops = xt_hook_link(&security_table, iptable_security_hook);