[PATCH 3.12 31/88] netfilter: x_tables: assert minimum target size

[Jiri Slaby]

From: Florian Westphal <f...@strlen.de>

3.12-stable review patch.  If anyone has any objections, please let me know.

===============

commit a08e4e190b866579896c09af59b3bdca821da2cd upstream.

The target size includes the size of the xt_entry_target struct.

Signed-off-by: Florian Westphal <f...@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pa...@netfilter.org>
Signed-off-by: Jiri Slaby <jsl...@suse.cz>
---
 net/netfilter/x_tables.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index 55b1e0ccb0e2..cc34bb38c814 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c
@@ -587,6 +587,9 @@ int xt_check_entry_offsets(const void *base,
                return -EINVAL;
 
        t = (void *)(e + target_offset);
+       if (t->u.target_size < sizeof(*t))
+               return -EINVAL;
+
        if (target_offset + t->u.target_size > next_offset)
                return -EINVAL;
 
-- 
2.9.1