diff options
| author | Florian Westphal <fw@strlen.de> | 2016-03-22 18:02:50 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-07-22 23:05:20 +1000 |
| commit | 9f710c241217d368d716288fb4eb6305ea88692e (patch) | |
| tree | 4b7b47ee500b4d9731c4dd551d541195c803195a /net/ipv4/netfilter/ip_tables.c | |
| parent | 29bb56e2cc91e8a9a1d44cd14fe04c48f77cce66 (diff) | |
| download | kernel_samsung_smdk4412-9f710c241217d368d716288fb4eb6305ea88692e.tar.gz kernel_samsung_smdk4412-9f710c241217d368d716288fb4eb6305ea88692e.tar.bz2 kernel_samsung_smdk4412-9f710c241217d368d716288fb4eb6305ea88692e.zip | |
netfilter: x_tables: make sure e->next_offset covers remaining blob size
Otherwise this function may read data beyond the ruleset blob.
Change-Id: I22f514057d3e0403d1af61f4d9555403ab9f72ea
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/ipv4/netfilter/ip_tables.c')
| -rw-r--r-- | net/ipv4/netfilter/ip_tables.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c index 795af4ea53c..2f5ef5b8047 100644 --- a/net/ipv4/netfilter/ip_tables.c +++ b/net/ipv4/netfilter/ip_tables.c @@ -726,7 +726,8 @@ check_entry_size_and_hooks(struct ipt_entry *e, unsigned int h; if ((unsigned long)e % __alignof__(struct ipt_entry) != 0 || - (unsigned char *)e + sizeof(struct ipt_entry) >= limit) { + (unsigned char *)e + sizeof(struct ipt_entry) >= limit || + (unsigned char *)e + e->next_offset > limit) { duprintf("Bad offset %p\n", e); return -EINVAL; } @@ -1483,7 +1484,8 @@ check_compat_entry_size_and_hooks(struct compat_ipt_entry *e, duprintf("check_compat_entry_size_and_hooks %p\n", e); if ((unsigned long)e % __alignof__(struct compat_ipt_entry) != 0 || - (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit) { + (unsigned char *)e + sizeof(struct compat_ipt_entry) >= limit || + (unsigned char *)e + e->next_offset > limit) { duprintf("Bad offset %p, limit = %p\n", e, limit); return -EINVAL; } |