renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00
Code

[NETFILTER]: Fix logging regression

Browse Source 
Loading one of the LOG target fails if a different target has already
registered itself as backend for the same family. This can affect the
ipt_LOG and ipt_ULOG modules when both are loaded.

Reported and tested by: <t.artem@mailcity.com>

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Patrick McHardy 2007-07-24 15:29:55 -07:00 committed by David S. Miller
parent ca983cefd9
commit 7e2acc7e27
4 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/bridge/netfilter/ebt_log.c
View File

@ -196,10 +196,8 @@ static int __init ebt_log_init(void)
ret = ebt_register_watcher(&log);
if (ret < 0)
return ret;
ret = nf_log_register(PF_BRIDGE, &ebt_log_logger);
if (ret < 0 && ret != -EEXIST)
ebt_unregister_watcher(&log);
return ret;
nf_log_register(PF_BRIDGE, &ebt_log_logger);
return 0;
}
static void __exit ebt_log_fini(void)

8
net/bridge/netfilter/ebt_ulog.c
View File

@ -308,12 +308,8 @@ static int __init ebt_ulog_init(void)
else if ((ret = ebt_register_watcher(&ulog)))
sock_release(ebtulognl->sk_socket);
if (nf_log_register(PF_BRIDGE, &ebt_ulog_logger) < 0) {
printk(KERN_WARNING "ebt_ulog: not logging via ulog "
"since somebody else already registered for PF_BRIDGE\n");
/* we cannot make module load fail here, since otherwise
* ebtables userspace would abort */
}
if (ret == 0)
nf_log_register(PF_BRIDGE, &ebt_ulog_logger);
return ret;
}

6
net/ipv4/netfilter/ipt_LOG.c
View File

@ -479,10 +479,8 @@ static int __init ipt_log_init(void)
ret = xt_register_target(&ipt_log_reg);
if (ret < 0)
return ret;
ret = nf_log_register(PF_INET, &ipt_log_logger);
if (ret < 0 && ret != -EEXIST)
xt_unregister_target(&ipt_log_reg);
return ret;
nf_log_register(PF_INET, &ipt_log_logger);
return 0;
}
static void __exit ipt_log_fini(void)

6
net/ipv6/netfilter/ip6t_LOG.c
View File

@ -493,10 +493,8 @@ static int __init ip6t_log_init(void)
ret = xt_register_target(&ip6t_log_reg);
if (ret < 0)
return ret;
ret = nf_log_register(PF_INET6, &ip6t_logger);
if (ret < 0 && ret != -EEXIST)
xt_unregister_target(&ip6t_log_reg);
return ret;
nf_log_register(PF_INET6, &ip6t_logger);
return 0;
}
static void __exit ip6t_log_fini(void)