We copy accoring to ->target|matchsize, so check that the netlink attribute
(which can include padding and might be larger) contains enough data.

Reported-by: Julia Lawall <julia.law...@lip6.fr>
Signed-off-by: Florian Westphal <f...@strlen.de>
---
 net/netfilter/nft_compat.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
index 454841b..6228c42 100644
--- a/net/netfilter/nft_compat.c
+++ b/net/netfilter/nft_compat.c
@@ -660,6 +660,9 @@ nft_match_select_ops(const struct nft_ctx *ctx,
        if (IS_ERR(match))
                return ERR_PTR(-ENOENT);
 
+       if (match->matchsize > nla_len(tb[NFTA_MATCH_INFO]))
+               return ERR_PTR(-EINVAL);
+
        /* This is the first time we use this match, allocate operations */
        nft_match = kzalloc(sizeof(struct nft_xt), GFP_KERNEL);
        if (nft_match == NULL)
@@ -740,6 +743,9 @@ nft_target_select_ops(const struct nft_ctx *ctx,
        if (IS_ERR(target))
                return ERR_PTR(-ENOENT);
 
+       if (target->targetsize > nla_len(tb[NFTA_TARGET_INFO]))
+               return ERR_PTR(-EINVAL);
+
        /* This is the first time we use this target, allocate operations */
        nft_target = kzalloc(sizeof(struct nft_xt), GFP_KERNEL);
        if (nft_target == NULL)
-- 
2.4.10

--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to