[NETFILTER]: x_tables: fix return values for LOG/ULOG (e1fd0586) · Commits · 戴 / test

net/ipv4/netfilter/ipt_LOG.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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");

+4 −3

Original line number	Diff line number	Diff line
		@@ -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);

+5 −2

Original line number	Diff line number	Diff line
		@@ -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");