[added to the 4.1 stable tree] netfilter: x_tables: assert minimum target size
From: Sasha Levin <hidden>
Date: 2016-07-12 03:00:38
Subsystem:
netfilter, networking [general], the rest · Maintainers:
Pablo Neira Ayuso, Florian Westphal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Florian Westphal <fw@strlen.de> This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. =============== [ Upstream commit a08e4e190b866579896c09af59b3bdca821da2cd ] The target size includes the size of the xt_entry_target struct. Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Sasha Levin <redacted> --- 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 b631357..ce9f7b3 100644
--- a/net/netfilter/x_tables.c
+++ b/net/netfilter/x_tables.c@@ -570,6 +570,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.5.0