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

netfilter: x_tables: don't move to non-existent next rule 



Ben Hawkes says:

 In the mark_source_chains function (net/ipv4/netfilter/ip_tables.c) it
 is possible for a user-supplied ipt_entry structure to have a large
 next_offset field. This field is not bounds checked prior to writing a
 counter value at the supplied offset.

Base chains enforce absolute verdict.

User defined chains are supposed to end with an unconditional return,
xtables userspace adds them automatically.

But if such return is missing we will move to non-existent next rule.

Reported-by: default avatarBen Hawkes <hawkes@google.com>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 7d45a04c

net/ipv4/netfilter/arp_tables.c

+5 −3
Original line number Diff line number Diff line
@@ -439,6 +439,8 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
				size = e->next_offset;

				e = (struct arpt_entry *)

					(entry0 + pos + size);

				if (pos + size >= newinfo->size)

					return 0;

				e->counters.pcnt = pos;

				pos += size;

			} else {
@@ -461,6 +463,8 @@ static int mark_source_chains(const struct xt_table_info *newinfo, 
				} else {

					/* ... this is a fallthru */

					newpos = pos + e->next_offset;

					if (newpos >= newinfo->size)

						return 0;

				}

				e = (struct arpt_entry *)

					(entry0 + newpos);
@@ -691,10 +695,8 @@ static int translate_table(struct xt_table_info *newinfo, void *entry0, 
		}

	}



	if (!mark_source_chains(newinfo, repl->valid_hooks, entry0)) {

		duprintf("Looping hook\n");

	if (!mark_source_chains(newinfo, repl->valid_hooks, entry0))

		return -ELOOP;

	}



	/* Finally, each sanity check must pass */

	i = 0;

net/ipv4/netfilter/ip_tables.c

+4 −0
Original line number Diff line number Diff line
@@ -520,6 +520,8 @@ mark_source_chains(const struct xt_table_info *newinfo, 
				size = e->next_offset;

				e = (struct ipt_entry *)

					(entry0 + pos + size);

				if (pos + size >= newinfo->size)

					return 0;

				e->counters.pcnt = pos;

				pos += size;

			} else {
@@ -541,6 +543,8 @@ mark_source_chains(const struct xt_table_info *newinfo, 
				} else {

					/* ... this is a fallthru */

					newpos = pos + e->next_offset;

					if (newpos >= newinfo->size)

						return 0;

				}

				e = (struct ipt_entry *)

					(entry0 + newpos);

net/ipv6/netfilter/ip6_tables.c

+4 −0
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ mark_source_chains(const struct xt_table_info *newinfo, 
				size = e->next_offset;

				e = (struct ip6t_entry *)

					(entry0 + pos + size);

				if (pos + size >= newinfo->size)

					return 0;

				e->counters.pcnt = pos;

				pos += size;

			} else {
@@ -553,6 +555,8 @@ mark_source_chains(const struct xt_table_info *newinfo, 
				} else {

					/* ... this is a fallthru */

					newpos = pos + e->next_offset;

					if (newpos >= newinfo->size)

						return 0;

				}

				e = (struct ip6t_entry *)

					(entry0 + newpos);

CRA Git | Maintained and supported by SUSTech CRA and CCSE