From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 18 Aug 2017 10:27:02 +0300
Subject: bpf: fix a return in sockmap_get_from_fd()
Patch-mainline: v4.14-rc1
Git-commit: ae2b27b859a144f503d382580320873c0beb09c7
References: bsc#1109837
"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: John Fastabend <john.fastabend@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
kernel/bpf/syscall.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1125,11 +1125,11 @@ static int sockmap_get_from_fd(const uni
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)