diff options
| author | Florian Westphal <fw@strlen.de> | 2016-03-10 01:56:23 +0100 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-05-17 22:11:13 +1000 |
| commit | 7656ba597d2714a580a91742a8adcc48a516b93b (patch) | |
| tree | b72208f033e263e090c153903dd64851b3d7c4ef /net | |
| parent | 634a18fa462f27fb73b1d7ec2646d2e08d391b41 (diff) | |
| download | kernel_samsung_smdk4412-7656ba597d2714a580a91742a8adcc48a516b93b.zip kernel_samsung_smdk4412-7656ba597d2714a580a91742a8adcc48a516b93b.tar.gz kernel_samsung_smdk4412-7656ba597d2714a580a91742a8adcc48a516b93b.tar.bz2 | |
netfilter: x_tables: check for size overflow
Ben Hawkes says:
integer overflow in xt_alloc_table_info, which on 32-bit systems can
lead to small structure allocation and a copy_from_user based heap
corruption.
Change-Id: I13c554c630651a37e3f6a195e9a5f40cddcb29a1
Reported-by: Ben Hawkes <hawkes@google.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/netfilter/x_tables.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index b0869fe..9d4ad83 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -663,6 +663,10 @@ struct xt_table_info *xt_alloc_table_info(unsigned int size) { struct xt_table_info *newinfo; int cpu; + size_t sz = sizeof(*newinfo) + size; + + if (sz < sizeof(*newinfo)) + return NULL; /* Pedantry: prevent them from hitting BUG() in vmalloc.c --RR */ if ((SMP_ALIGN(size) >> PAGE_SHIFT) + 2 > totalram_pages) |