projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5b96668
)
bpf: Fix error return code in map_lookup_and_delete_elem()
author
Wei Yongjun
<weiyongjun1@huawei.com>
Thu, 30 Apr 2020 08:18:51 +0000
(08:18 +0000)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Wed, 20 May 2020 06:20:19 +0000
(08:20 +0200)
[ Upstream commit
7f645462ca01d01abb94d75e6768c8b3ed3a188b
]
Fix to return negative error code -EFAULT from the copy_to_user() error
handling case instead of 0, as done elsewhere in this function.
Fixes:
bd513cd08f10
("bpf: add MAP_LOOKUP_AND_DELETE_ELEM syscall")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link:
https://lore.kernel.org/bpf/20200430081851.166996-1-weiyongjun1@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/bpf/syscall.c
patch
|
blob
|
history
diff --git
a/kernel/bpf/syscall.c
b/kernel/bpf/syscall.c
index
14f4a76
..
946cfdd
100644
(file)
--- a/
kernel/bpf/syscall.c
+++ b/
kernel/bpf/syscall.c
@@
-1146,8
+1146,10
@@
static int map_lookup_and_delete_elem(union bpf_attr *attr)
if (err)
goto free_value;
- if (copy_to_user(uvalue, value, value_size) != 0)
+ if (copy_to_user(uvalue, value, value_size) != 0) {
+ err = -EFAULT;
goto free_value;
+ }
err = 0;