From: Florian Westphal Date: Thu, 10 Mar 2016 16:26:39 +0000 (+0100) Subject: UBUNTU: SAUCE: [nf,v2] netfilter: x_tables: don't rely on well-behaving userspace X-Git-Tag: Ubuntu-4.10.0-9.11~353 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b09c5fc73b2d16ab44c044c21b29df4d8b251bbc;p=mirror_ubuntu-zesty-kernel.git UBUNTU: SAUCE: [nf,v2] netfilter: x_tables: don't rely on well-behaving userspace BugLink: http://bugs.launchpad.net/bugs/1555338 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. Problem is that xt_entry_foreach() macro stops iterating once e->next_offset is out of bounds, assuming this is the last entry. With malformed data thats not necessarily the case so we can write outside of allocated area later as we might not have walked the entire blob. Fix this by simplifying mark_source_chains -- it already has to check if nextoff is in range to catch invalid jumps, so just do the check when we move to a next entry as well. Also, check that the offset meets the xtables_entry alignment. Reported-by: Ben Hawkes Signed-off-by: Florian Westphal Signed-off-by: Chris J. Arges Acked-by: Brad Figg Signed-off-by: Brad Figg Signed-off-by: Tim Gardner --- diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c index a467e1236c43..720fc81b09dd 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c @@ -295,6 +295,17 @@ static inline bool unconditional(const struct arpt_entry *e) memcmp(&e->arp, &uncond, sizeof(uncond)) == 0; } +static bool next_offset_ok(const struct xt_table_info *t, unsigned int newpos) +{ + if (newpos > t->size - sizeof(struct arpt_entry)) + return false; + + if (newpos % __alignof__(struct arpt_entry) != 0) + return false; + + return true; +} + /* Figures out from what hook each rule can be called: returns 0 if * there are loops. Puts hook bitmask in comefrom. */ @@ -360,6 +371,8 @@ static int mark_source_chains(const struct xt_table_info *newinfo, /* Move along one */ size = e->next_offset; + if (!next_offset_ok(newinfo, pos + size)) + return 0; e = (struct arpt_entry *) (entry0 + pos + size); if (pos + size >= newinfo->size) @@ -384,6 +397,10 @@ static int mark_source_chains(const struct xt_table_info *newinfo, if (newpos >= newinfo->size) return 0; } + + if (!next_offset_ok(newinfo, newpos)) + return 0; + e = (struct arpt_entry *) (entry0 + newpos); e->counters.pcnt = pos; diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 91656a1d8fbd..a57af687374b 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -369,6 +369,17 @@ ipt_do_table(struct sk_buff *skb, else return verdict; } +static bool next_offset_ok(const struct xt_table_info *t, unsigned int newpos) +{ + if (newpos > t->size - sizeof(struct ipt_entry)) + return false; + + if (newpos % __alignof__(struct ipt_entry) != 0) + return false; + + return true; +} + /* Figures out from what hook each rule can be called: returns 0 if there are loops. Puts hook bitmask in comefrom. */ static int @@ -430,6 +441,8 @@ mark_source_chains(const struct xt_table_info *newinfo, /* Move along one */ size = e->next_offset; + if (!next_offset_ok(newinfo, pos + size)) + return 0; e = (struct ipt_entry *) (entry0 + pos + size); if (pos + size >= newinfo->size) @@ -454,6 +467,10 @@ mark_source_chains(const struct xt_table_info *newinfo, if (newpos >= newinfo->size) return 0; } + + if (!next_offset_ok(newinfo, newpos)) + return 0; + e = (struct ipt_entry *) (entry0 + newpos); e->counters.pcnt = pos; diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c index 25a022d41a70..b1b96c90543b 100644 --- a/net/ipv6/netfilter/ip6_tables.c +++ b/net/ipv6/netfilter/ip6_tables.c @@ -398,6 +398,17 @@ ip6t_do_table(struct sk_buff *skb, else return verdict; } +static bool next_offset_ok(const struct xt_table_info *t, unsigned int newpos) +{ + if (newpos > t->size - sizeof(struct ip6t_entry)) + return false; + + if (newpos % __alignof__(struct ip6t_entry) != 0) + return false; + + return true; +} + /* Figures out from what hook each rule can be called: returns 0 if there are loops. Puts hook bitmask in comefrom. */ static int @@ -459,6 +470,8 @@ mark_source_chains(const struct xt_table_info *newinfo, /* Move along one */ size = e->next_offset; + if (!next_offset_ok(newinfo, pos + size)) + return 0; e = (struct ip6t_entry *) (entry0 + pos + size); if (pos + size >= newinfo->size) @@ -483,6 +496,10 @@ mark_source_chains(const struct xt_table_info *newinfo, if (newpos >= newinfo->size) return 0; } + + if (!next_offset_ok(newinfo, newpos)) + return 0; + e = (struct ip6t_entry *) (entry0 + newpos); e->counters.pcnt = pos;