Skip to content

Commit

Permalink
[NETFILTER]: x_tables: fix return values for LOG/ULOG
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jan Engelhardt authored and David S. Miller committed Feb 8, 2007
1 parent 41f4689 commit e1fd058
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
7 changes: 5 additions & 2 deletions net/ipv4/netfilter/ipt_LOG.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
7 changes: 4 additions & 3 deletions net/ipv4/netfilter/ipt_ULOG.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -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);
Expand Down
7 changes: 5 additions & 2 deletions net/ipv6/netfilter/ip6t_LOG.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down

0 comments on commit e1fd058

Please sign in to comment.