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

Signed-off-by: Wang Yufen <wangyufen@huawei.com>
---
 kernel/bpf/syscall.c | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 4fb08c4..f862406 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -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

On Tue, Sep 13, 2022 at 1:29 AM Wang Yufen <wangyufen@huawei.com> wrote:
>
> Use kvmemdup_bpfptr helper instead of open-coding to
> simplify the code.
>
> Signed-off-by: Wang Yufen <wangyufen@huawei.com>

Acked-by: Stanislav Fomichev <sdf@google.com>

> ---
>  kernel/bpf/syscall.c | 13 ++++---------
>  1 file changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
> index 4fb08c4..f862406 100644
> --- a/kernel/bpf/syscall.c
> +++ b/kernel/bpf/syscall.c
> @@ -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
>

Hello:

This patch was applied to bpf/bpf-next.git (master)
by Martin KaFai Lau <martin.lau@kernel.org>:

On Tue, 13 Sep 2022 16:40:33 +0800 you wrote:
> Use kvmemdup_bpfptr helper instead of open-coding to
> simplify the code.
> 
> Signed-off-by: Wang Yufen <wangyufen@huawei.com>
> ---
>  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!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html