lkml.org 
[lkml]   [2018]   [Mar]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC] netfilter: cttimeout: remove VLA in ctnl_timeout_parse_policy
    In preparation to enabling -Wvla, remove VLA and replace it
    with dynamic memory allocation.

    Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
    ---
    net/netfilter/nfnetlink_cttimeout.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    diff --git a/net/netfilter/nfnetlink_cttimeout.c b/net/netfilter/nfnetlink_cttimeout.c
    index 95b0470..a2f7d92 100644
    --- a/net/netfilter/nfnetlink_cttimeout.c
    +++ b/net/netfilter/nfnetlink_cttimeout.c
    @@ -52,18 +52,26 @@ ctnl_timeout_parse_policy(void *timeouts,
    struct net *net, const struct nlattr *attr)
    {
    int ret = 0;
    + struct nlattr **tb = NULL;

    if (likely(l4proto->ctnl_timeout.nlattr_to_obj)) {
    - struct nlattr *tb[l4proto->ctnl_timeout.nlattr_max+1];
    + tb = kcalloc(l4proto->ctnl_timeout.nlattr_max + 1, sizeof(*tb),
    + GFP_KERNEL);
    +
    + if (!tb)
    + return -ENOMEM;

    ret = nla_parse_nested(tb, l4proto->ctnl_timeout.nlattr_max,
    attr, l4proto->ctnl_timeout.nla_policy,
    NULL);
    if (ret < 0)
    - return ret;
    + goto err;

    ret = l4proto->ctnl_timeout.nlattr_to_obj(tb, net, timeouts);
    }
    +
    +err:
    + kfree(tb);
    return ret;
    }

    --
    2.7.4
    \
     
     \ /
      Last update: 2018-03-06 20:12    [W:3.627 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site