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

Commit 9782a11e authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: compat: prepare xt_compat_init_offsets to return errors 



should have no impact, function still always returns 0.
This patch is only to ease review.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent c84ca954

include/linux/netfilter/x_tables.h

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ void xt_compat_unlock(u_int8_t af); 


int xt_compat_add_offset(u_int8_t af, unsigned int offset, int delta);

void xt_compat_flush_offsets(u_int8_t af);

void xt_compat_init_offsets(u_int8_t af, unsigned int number);

int xt_compat_init_offsets(u8 af, unsigned int number);

int xt_compat_calc_jump(u_int8_t af, unsigned int offset);



int xt_compat_match_offset(const struct xt_match *match);

net/bridge/netfilter/ebtables.c

+8 −2
Original line number Diff line number Diff line
@@ -1819,10 +1819,14 @@ static int compat_table_info(const struct ebt_table_info *info, 
{

	unsigned int size = info->entries_size;

	const void *entries = info->entries;

	int ret;



	newinfo->entries_size = size;



	xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries);

	ret = xt_compat_init_offsets(NFPROTO_BRIDGE, info->nentries);

	if (ret)

		return ret;



	return EBT_ENTRY_ITERATE(entries, size, compat_calc_entry, info,

							entries, newinfo);

}
@@ -2245,7 +2249,9 @@ static int compat_do_replace(struct net *net, void __user *user, 


	xt_compat_lock(NFPROTO_BRIDGE);



	xt_compat_init_offsets(NFPROTO_BRIDGE, tmp.nentries);

	ret = xt_compat_init_offsets(NFPROTO_BRIDGE, tmp.nentries);

	if (ret < 0)

		goto out_unlock;

	ret = compat_copy_entries(entries_tmp, tmp.entries_size, &state);

	if (ret < 0)

		goto out_unlock;

net/ipv4/netfilter/arp_tables.c

+7 −3
Original line number Diff line number Diff line
@@ -769,7 +769,9 @@ static int compat_table_info(const struct xt_table_info *info, 
	memcpy(newinfo, info, offsetof(struct xt_table_info, entries));

	newinfo->initial_entries = 0;

	loc_cpu_entry = info->entries;

	xt_compat_init_offsets(NFPROTO_ARP, info->number);

	ret = xt_compat_init_offsets(NFPROTO_ARP, info->number);

	if (ret)

		return ret;

	xt_entry_foreach(iter, loc_cpu_entry, info->size) {

		ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);

		if (ret != 0)
@@ -1156,7 +1158,7 @@ static int translate_compat_table(struct xt_table_info **pinfo, 
	struct compat_arpt_entry *iter0;

	struct arpt_replace repl;

	unsigned int size;

	int ret = 0;

	int ret;



	info = *pinfo;

	entry0 = *pentry0;
@@ -1165,7 +1167,9 @@ static int translate_compat_table(struct xt_table_info **pinfo, 


	j = 0;

	xt_compat_lock(NFPROTO_ARP);

	xt_compat_init_offsets(NFPROTO_ARP, compatr->num_entries);

	ret = xt_compat_init_offsets(NFPROTO_ARP, compatr->num_entries);

	if (ret)

		goto out_unlock;

	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter0, entry0, compatr->size) {

		ret = check_compat_entry_size_and_hooks(iter0, info, &size,

net/ipv4/netfilter/ip_tables.c

+6 −2
Original line number Diff line number Diff line
@@ -933,7 +933,9 @@ static int compat_table_info(const struct xt_table_info *info, 
	memcpy(newinfo, info, offsetof(struct xt_table_info, entries));

	newinfo->initial_entries = 0;

	loc_cpu_entry = info->entries;

	xt_compat_init_offsets(AF_INET, info->number);

	ret = xt_compat_init_offsets(AF_INET, info->number);

	if (ret)

		return ret;

	xt_entry_foreach(iter, loc_cpu_entry, info->size) {

		ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);

		if (ret != 0)
@@ -1407,7 +1409,9 @@ translate_compat_table(struct net *net, 


	j = 0;

	xt_compat_lock(AF_INET);

	xt_compat_init_offsets(AF_INET, compatr->num_entries);

	ret = xt_compat_init_offsets(AF_INET, compatr->num_entries);

	if (ret)

		goto out_unlock;

	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter0, entry0, compatr->size) {

		ret = check_compat_entry_size_and_hooks(iter0, info, &size,

net/ipv6/netfilter/ip6_tables.c

+7 −3
Original line number Diff line number Diff line
@@ -950,7 +950,9 @@ static int compat_table_info(const struct xt_table_info *info, 
	memcpy(newinfo, info, offsetof(struct xt_table_info, entries));

	newinfo->initial_entries = 0;

	loc_cpu_entry = info->entries;

	xt_compat_init_offsets(AF_INET6, info->number);

	ret = xt_compat_init_offsets(AF_INET6, info->number);

	if (ret)

		return ret;

	xt_entry_foreach(iter, loc_cpu_entry, info->size) {

		ret = compat_calc_entry(iter, info, loc_cpu_entry, newinfo);

		if (ret != 0)
@@ -1414,7 +1416,7 @@ translate_compat_table(struct net *net, 
	struct compat_ip6t_entry *iter0;

	struct ip6t_replace repl;

	unsigned int size;

	int ret = 0;

	int ret;



	info = *pinfo;

	entry0 = *pentry0;
@@ -1423,7 +1425,9 @@ translate_compat_table(struct net *net, 


	j = 0;

	xt_compat_lock(AF_INET6);

	xt_compat_init_offsets(AF_INET6, compatr->num_entries);

	ret = xt_compat_init_offsets(AF_INET6, compatr->num_entries);

	if (ret)

		goto out_unlock;

	/* Walk through entries, checking offsets. */

	xt_entry_foreach(iter0, entry0, compatr->size) {

		ret = check_compat_entry_size_and_hooks(iter0, info, &size,