| Message ID | 1440558395-7765-3-git-send-email-ast@plumgrid.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 08/26/2015 05:06 AM, Alexei Starovoitov wrote: > Fix harmless typo and avoid unnecessary copy of empty 'prog' into > unused 'strcut tcf_bpf_cfg old'. > > Fixes: f4eaed28c783 ("act_bpf: fix memory leaks when replacing bpf programs") > Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> Correct tag is actually net-next commit a5c90b29e5cc ("act_bpf: properly support late binding of bpf action to a classifier"). Thanks for catching it! Acked-by: Daniel Borkmann <daniel@iogearbox.net> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/sched/act_bpf.c b/net/sched/act_bpf.c index 1b97dabc621a..458cf647e698 100644 --- a/net/sched/act_bpf.c +++ b/net/sched/act_bpf.c @@ -327,7 +327,7 @@ static int tcf_bpf_init(struct net *net, struct nlattr *nla, prog = to_bpf(act); spin_lock_bh(&prog->tcf_lock); - if (ret != ACT_P_CREATED) + if (res != ACT_P_CREATED) tcf_bpf_prog_fill_cfg(prog, &old); prog->bpf_ops = cfg.bpf_ops;
Fix harmless typo and avoid unnecessary copy of empty 'prog' into unused 'strcut tcf_bpf_cfg old'. Fixes: f4eaed28c783 ("act_bpf: fix memory leaks when replacing bpf programs") Signed-off-by: Alexei Starovoitov <ast@plumgrid.com> --- net/sched/act_bpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)