Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <1663058433-14089-1-git-send-email-wangyufen@huawei.com>
In-Reply-To: <1663058433-14089-1-git-send-email-wangyufen@huawei.com>
From:   Stanislav Fomichev <sdf@google.com>
Date:   Tue, 13 Sep 2022 15:30:53 -0700
Message-ID: <CAKH8qBsoc8Upz=NvOtD=SOfVPcEnW-2wghbM1zYBacBwmGNvAQ@mail.gmail.com>
Subject: Re: [bpf-next v2] bpf: use kvmemdup_bpfptr helper
To:     Wang Yufen <wangyufen@huawei.com>
Cc:     ast@kernel.org, daniel@iogearbox.net, john.fastabend@gmail.com,
        andrii@kernel.org, martin.lau@linux.dev, song@kernel.org,
        yhs@fb.com, kpsingh@kernel.org, haoluo@google.com,
        jolsa@kernel.org, bpf@vger.kernel.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

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
>