Commit 14463859 authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Pablo Neira Ayuso

netfilter: nfnetlink_cthelper: Remove VLA usage

In preparation to enabling -Wvla, remove VLA and replace it
with dynamic memory allocation.

>From a security viewpoint, the use of Variable Length Arrays can be
a vector for stack overflow attacks. Also, in general, as the code
evolves it is easy to lose track of how big a VLA can get. Thus, we
can end up having segfaults that are hard to debug.

Also, fixed as part of the directive to remove all VLAs from
the kernel: https://lkml.org/lkml/2018/3/7/621Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 8039ab43
...@@ -314,23 +314,30 @@ nfnl_cthelper_update_policy_one(const struct nf_conntrack_expect_policy *policy, ...@@ -314,23 +314,30 @@ nfnl_cthelper_update_policy_one(const struct nf_conntrack_expect_policy *policy,
static int nfnl_cthelper_update_policy_all(struct nlattr *tb[], static int nfnl_cthelper_update_policy_all(struct nlattr *tb[],
struct nf_conntrack_helper *helper) struct nf_conntrack_helper *helper)
{ {
struct nf_conntrack_expect_policy new_policy[helper->expect_class_max + 1]; struct nf_conntrack_expect_policy *new_policy;
struct nf_conntrack_expect_policy *policy; struct nf_conntrack_expect_policy *policy;
int i, err; int i, ret = 0;
new_policy = kmalloc_array(helper->expect_class_max + 1,
sizeof(*new_policy), GFP_KERNEL);
if (!new_policy)
return -ENOMEM;
/* Check first that all policy attributes are well-formed, so we don't /* Check first that all policy attributes are well-formed, so we don't
* leave things in inconsistent state on errors. * leave things in inconsistent state on errors.
*/ */
for (i = 0; i < helper->expect_class_max + 1; i++) { for (i = 0; i < helper->expect_class_max + 1; i++) {
if (!tb[NFCTH_POLICY_SET + i]) if (!tb[NFCTH_POLICY_SET + i]) {
return -EINVAL; ret = -EINVAL;
goto err;
}
err = nfnl_cthelper_update_policy_one(&helper->expect_policy[i], ret = nfnl_cthelper_update_policy_one(&helper->expect_policy[i],
&new_policy[i], &new_policy[i],
tb[NFCTH_POLICY_SET + i]); tb[NFCTH_POLICY_SET + i]);
if (err < 0) if (ret < 0)
return err; goto err;
} }
/* Now we can safely update them. */ /* Now we can safely update them. */
for (i = 0; i < helper->expect_class_max + 1; i++) { for (i = 0; i < helper->expect_class_max + 1; i++) {
...@@ -340,7 +347,9 @@ static int nfnl_cthelper_update_policy_all(struct nlattr *tb[], ...@@ -340,7 +347,9 @@ static int nfnl_cthelper_update_policy_all(struct nlattr *tb[],
policy->timeout = new_policy->timeout; policy->timeout = new_policy->timeout;
} }
return 0; err:
kfree(new_policy);
return ret;
} }
static int nfnl_cthelper_update_policy(struct nf_conntrack_helper *helper, static int nfnl_cthelper_update_policy(struct nf_conntrack_helper *helper,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment