| Message ID | 20170818071210.wyq37kura6wz6bx6@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On 08/18/2017 12:27 AM, Dan Carpenter wrote: > "map" is a valid pointer. We wanted to return "err" instead. Also > let's return a zero literal at the end. > > Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c > index d2f2bdf71ffa..b8cb1b3c9bfb 100644 > --- a/kernel/bpf/syscall.c > +++ b/kernel/bpf/syscall.c Thanks, just a note though the sockmap attach call can not fail so this branch is effectively never used. We could just remove the branch but having an unchecked 'err' code seems fragile if we ever do find a reason to fail in the attach path. Acked-by: John Fastabend <john.fastabend@gmail.com> > @@ -1125,11 +1125,11 @@ static int sockmap_get_from_fd(const union bpf_attr *attr, int ptype) > fdput(f); > bpf_prog_put(prog1); > bpf_prog_put(prog2); > - return PTR_ERR(map); > + return err; > } > > fdput(f); > - return err; > + return 0; > } > > static int bpf_prog_attach(const union bpf_attr *attr) >
On 08/18/2017 09:27 AM, Dan Carpenter wrote: > "map" is a valid pointer. We wanted to return "err" instead. Also > let's return a zero literal at the end. > > Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Acked-by: Daniel Borkmann <daniel@iogearbox.net>
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Fri, 18 Aug 2017 10:27:02 +0300 > "map" is a valid pointer. We wanted to return "err" instead. Also > let's return a zero literal at the end. > > Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied.
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index d2f2bdf71ffa..b8cb1b3c9bfb 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1125,11 +1125,11 @@ static int sockmap_get_from_fd(const union bpf_attr *attr, int ptype) fdput(f); bpf_prog_put(prog1); bpf_prog_put(prog2); - return PTR_ERR(map); + return err; } fdput(f); - return err; + return 0; } static int bpf_prog_attach(const union bpf_attr *attr)
"map" is a valid pointer. We wanted to return "err" instead. Also let's return a zero literal at the end. Fixes: 174a79ff9515 ("bpf: sockmap with sk redirect support") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>