[NETFILTER]: x_tables: fix return values for LOG/ULOG

Signed-off-by: Jan Engelhardt <jengelh@gmx.de>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/netfilter/ipt_LOG.c b/net/ipv4/netfilter/ipt_LOG.c
index c96de16fefae67ed9a634fd2ad8c2f56edf65289..37778c72aeaaedc3beb987c89c8194cdb42a0951 100644 (file)
--- a/net/ipv4/netfilter/ipt_LOG.c
+++ b/net/ipv4/netfilter/ipt_LOG.c
@@ -471,8 +471,11 @@ static struct nf_logger ipt_log_logger ={
 
 static int __init ipt_log_init(void)
 {
-       if (ipt_register_target(&ipt_log_reg))
-               return -EINVAL;
+       int ret;
+
+       ret = ipt_register_target(&ipt_log_reg);
+       if (ret < 0)
+               return ret;
        if (nf_log_register(PF_INET, &ipt_log_logger) < 0) {
                printk(KERN_WARNING "ipt_LOG: not logging via system console "
                       "since somebody else already registered for PF_INET\n");

diff --git a/net/ipv4/netfilter/ipt_ULOG.c b/net/ipv4/netfilter/ipt_ULOG.c
index dbd34783a64d0e233989a869b4e934f75255ac48..a47e279eaac2c09f3f175afac3e4720654f3ed7c 100644 (file)
--- a/net/ipv4/netfilter/ipt_ULOG.c
+++ b/net/ipv4/netfilter/ipt_ULOG.c
@@ -379,7 +379,7 @@ static struct nf_logger ipt_ulog_logger = {
 
 static int __init ipt_ulog_init(void)
 {
-       int i;
+       int ret, i;
 
        DEBUGP("ipt_ULOG: init module\n");
 
@@ -400,9 +400,10 @@ static int __init ipt_ulog_init(void)
        if (!nflognl)
                return -ENOMEM;
 
-       if (ipt_register_target(&ipt_ulog_reg) != 0) {
+       ret = ipt_register_target(&ipt_ulog_reg);
+       if (ret < 0) {
                sock_release(nflognl->sk_socket);
-               return -EINVAL;
+               return ret;
        }
        if (nflog)
                nf_log_register(PF_INET, &ipt_ulog_logger);

diff --git a/net/ipv6/netfilter/ip6t_LOG.c b/net/ipv6/netfilter/ip6t_LOG.c
index 33b1faa90d740a85e7f027780019b74b728486ef..9fe0816bb21d0b10ede09fc66243922c13ad91a6 100644 (file)
--- a/net/ipv6/netfilter/ip6t_LOG.c
+++ b/net/ipv6/netfilter/ip6t_LOG.c
@@ -482,8 +482,11 @@ static struct nf_logger ip6t_logger = {
 
 static int __init ip6t_log_init(void)
 {
-       if (ip6t_register_target(&ip6t_log_reg))
-               return -EINVAL;
+       int ret;
+
+       ret = ip6t_register_target(&ip6t_log_reg);
+       if (ret < 0)
+               return ret;
        if (nf_log_register(PF_INET6, &ip6t_logger) < 0) {
                printk(KERN_WARNING "ip6t_LOG: not logging via system console "
                       "since somebody else already registered for PF_INET6\n");