act_bpf: Use kmemdup instead of duplicating it in tcf_bpf_init_from_ops
authorYueHaibing <yuehaibing@huawei.com>
Sat, 28 Jul 2018 10:38:06 +0000 (18:38 +0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 Jul 2018 20:20:16 +0000 (13:20 -0700)
Replace calls to kmalloc followed by a memcpy with a direct call to
kmemdup.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sched/act_bpf.c

index 06f743d8ed4130bc3cc53996ecb9313546230066..6203eb075c9aab06fc9ff30d762b774d2d9d2e71 100644 (file)
@@ -196,12 +196,10 @@ static int tcf_bpf_init_from_ops(struct nlattr **tb, struct tcf_bpf_cfg *cfg)
        if (bpf_size != nla_len(tb[TCA_ACT_BPF_OPS]))
                return -EINVAL;
 
-       bpf_ops = kzalloc(bpf_size, GFP_KERNEL);
+       bpf_ops = kmemdup(nla_data(tb[TCA_ACT_BPF_OPS]), bpf_size, GFP_KERNEL);
        if (bpf_ops == NULL)
                return -ENOMEM;
 
-       memcpy(bpf_ops, nla_data(tb[TCA_ACT_BPF_OPS]), bpf_size);
-
        fprog_tmp.len = bpf_num_ops;
        fprog_tmp.filter = bpf_ops;