Skip to content

Commit

Permalink
bpf: use kvmemdup_bpfptr helper
Browse files Browse the repository at this point in the history
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>
Link: https://lore.kernel.org/r/1663058433-14089-1-git-send-email-wangyufen@huawei.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
  • Loading branch information
Wang Yufen authored and Martin KaFai Lau committed Sep 16, 2022
1 parent 47e34cb commit a02c118
Showing 1 changed file with 4 additions and 9 deletions.
13 changes: 4 additions & 9 deletions kernel/bpf/syscall.c
Original file line number Diff line number Diff line change
Expand Up @@ -1417,19 +1417,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);
Expand Down

0 comments on commit a02c118

Please sign in to comment.