From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Fri, 18 Aug 2017 07:27:02 +0000 (+0300)
Subject: bpf: fix a return in sockmap_get_from_fd()
X-Git-Tag: v4.14-rc1~130^2~216
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ae2b27b859a144f503d382580320873c0beb09c7;p=platform%2Fkernel%2Flinux-rpi.git

bpf: fix a return in sockmap_get_from_fd()

"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>
---

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index d2f2bdf..b8cb1b3 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)