| Message ID | 20200601162814.17426-1-efremov@linux.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | bpf: Change kvfree to kfree in generic_map_lookup_batch() | expand |
On Mon, Jun 1, 2020 at 9:29 AM Denis Efremov <efremov@linux.com> wrote: > > buf_prevkey in generic_map_lookup_batch() is allocated with > kmalloc(). It's safe to free it with kfree(). > > Signed-off-by: Denis Efremov <efremov@linux.com> Please add prefix "PATCH bpf" or "PATCH bpf-next" to indicate which tree this should apply to. This one looks more like for bpf-next, as current code still works. For patches to bpf-next, we should wait after the merge window. Also, maybe add: Fixes: cb4d03ab499d ("bpf: Add generic support for lookup batch op") Acked-by: Song Liu <songliubraving@fb.com> Thanks, Song
On Mon, Jun 1, 2020 at 1:18 PM Song Liu <song@kernel.org> wrote: > > On Mon, Jun 1, 2020 at 9:29 AM Denis Efremov <efremov@linux.com> wrote: > > > > buf_prevkey in generic_map_lookup_batch() is allocated with > > kmalloc(). It's safe to free it with kfree(). > > > > Signed-off-by: Denis Efremov <efremov@linux.com> > > Please add prefix "PATCH bpf" or "PATCH bpf-next" to indicate which > tree this should > apply to. This one looks more like for bpf-next, as current code still > works. For patches > to bpf-next, we should wait after the merge window. > > Also, maybe add: > > Fixes: cb4d03ab499d ("bpf: Add generic support for lookup batch op") > > Acked-by: Song Liu <songliubraving@fb.com> Applied to bpf-next. Thanks
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 4e6dee19a668..10bb622be5b6 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -1383,7 +1383,7 @@ int generic_map_lookup_batch(struct bpf_map *map, buf = kmalloc(map->key_size + value_size, GFP_USER | __GFP_NOWARN); if (!buf) { - kvfree(buf_prevkey); + kfree(buf_prevkey); return -ENOMEM; }
buf_prevkey in generic_map_lookup_batch() is allocated with kmalloc(). It's safe to free it with kfree(). Signed-off-by: Denis Efremov <efremov@linux.com> --- kernel/bpf/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)