Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da298d3a authored Jun 27, 2006 by Patrick McHardy Committed by David S. Miller Jun 29, 2006

[NETFILTER]: x_tables: fix xt_register_table error propagation



When xt_register_table fails the error is not properly propagated back.
Based on patch by Lepton Wu <ytht.net@gmail.com>.

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bf7e8511

net/ipv4/netfilter/arp_tables.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1120,7 +1120,8 @@ int arpt_register_table(struct arpt_table *table,
	return ret;		return ret;
	}		}

	if (xt_register_table(table, &bootstrap, newinfo) != 0) {		ret = xt_register_table(table, &bootstrap, newinfo);
			if (ret != 0) {
	xt_free_table_info(newinfo);		xt_free_table_info(newinfo);
	return ret;		return ret;
	}		}

net/ipv4/netfilter/ip_tables.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2113,7 +2113,8 @@ int ipt_register_table(struct xt_table table, const struct ipt_replace repl)
	return ret;		return ret;
	}		}

	if (xt_register_table(table, &bootstrap, newinfo) != 0) {		ret = xt_register_table(table, &bootstrap, newinfo);
			if (ret != 0) {
	xt_free_table_info(newinfo);		xt_free_table_info(newinfo);
	return ret;		return ret;
	}		}

net/ipv6/netfilter/ip6_tables.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1281,7 +1281,8 @@ int ip6t_register_table(struct xt_table *table,
	return ret;		return ret;
	}		}

	if (xt_register_table(table, &bootstrap, newinfo) != 0) {		ret = xt_register_table(table, &bootstrap, newinfo);
			if (ret != 0) {
	xt_free_table_info(newinfo);		xt_free_table_info(newinfo);
	return ret;		return ret;
	}		}