Skip to contentSkip to conversation

bpf: use kvmemdup_bpfptr helper

PATCH Applied Wang Yufen 3 participants 3 messages Sep 13, 2022 – Sep 16, 2022

Subsystems (2)
lore
Share & tools
lore

Wang Yufen

author
#0 lore raw

PATCH v2 1/1 bpf: use kvmemdup_bpfptr helper

Use kvmemdup_bpfptr helper instead of open-coding to simplify the code.

---
 kernel/bpf/syscall.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
kernel/bpf/syscall.c +4 -9
index 4fb08c4..f862406 100644
@@ -1416,19 +1416,14 @@ static int map_update_elem(union bpf_attr *attr, bpfptr_t uattr)
 	}
 
 	value_size = bpf_map_value_size(map);
-
-	err = -ENOMEM;
-	value = kvmalloc(value_size, GFP_USER | __GFP_NOWARN);
-	if (!value)
+	value = kvmemdup_bpfptr(uvalue, value_size);
+	if (IS_ERR(value)) {
+		err = PTR_ERR(value);
 		goto free_key;
-
-	err = -EFAULT;
-	if (copy_from_bpfptr(value, uvalue, value_size) != 0)
-		goto free_value;
+	}
 
 	err = bpf_map_update_value(map, f, key, value, attr->flags);
 
-free_value:
 	kvfree(value);
 free_key:
 	kvfree(key);
Signature · 1 line
1.8.3.1
Acked-by on v2 1/1
#1 lore raw
Quoted 5 lines · Wang Yufen

Use kvmemdup_bpfptr helper instead of open-coding to simplify the code.

Quoted 35 lines
---
 kernel/bpf/syscall.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)
kernel/bpf/syscall.c +4 -10
index 4fb08c4..f862406 100644
@@ -1416,19 +1416,14 @@ static int map_update_elem(union bpf_attr *attr, bpfptr_t uattr)
        }
 
        value_size = bpf_map_value_size(map);
-
-       err = -ENOMEM;
-       value = kvmalloc(value_size, GFP_USER | __GFP_NOWARN);
-       if (!value)
+       value = kvmemdup_bpfptr(uvalue, value_size);
+       if (IS_ERR(value)) {
+               err = PTR_ERR(value);
                goto free_key;
-
-       err = -EFAULT;
-       if (copy_from_bpfptr(value, uvalue, value_size) != 0)
-               goto free_value;
+       }
 
        err = bpf_map_update_value(map, f, key, value, attr->flags);
 
-free_value:
        kvfree(value);
 free_key:
        kvfree(key);
--

1.8.3.1

#2 lore raw
In reply to Wang Yufen
This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Hello:

This patch was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:

Quoted 7 lines · On Tue, 13 Sep 2022 16:40:33 +0800 you wrote:

Use kvmemdup_bpfptr helper instead of open-coding to simplify the code.

---
 kernel/bpf/syscall.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Here is the summary with links:
- [bpf-next,v2] bpf: use kvmemdup_bpfptr helper

    https://git.kernel.org/bpf/bpf-next/c/a02c118ee9e8

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html