Skip to content

Commit b5c111f

Browse files
ameryhungMartin KaFai Lau
authored andcommitted
bpf: Fix sk_local_storage diag dumping uninitialized special fields
Call check_and_init_map_value() after the copy_map_value() to zero out special field regions. diag_get() copies sk_local_storage map values into a netlink message using copy_map_value{_locked}(), which intentionally skip special fields. However, the destination buffer from nla_reserve_64bit() is not zeroed and the skipped regions contain uninitialized skb data can be sent to userspace. Fixes: 1ed4d92 ("bpf: INET_DIAG support in bpf_sk_storage") Signed-off-by: Amery Hung <ameryhung@gmail.com> Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org> Link: https://patch.msgid.link/20260423222356.155387-1-ameryhung@gmail.com
1 parent 1081de1 commit b5c111f

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

net/core/bpf_sk_storage.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,7 @@ static int diag_get(struct bpf_local_storage_map *smap,
557557
sdata->data, true);
558558
else
559559
copy_map_value(&smap->map, nla_data(nla_value), sdata->data);
560+
check_and_init_map_value(&smap->map, nla_data(nla_value));
560561

561562
nla_nest_end(skb, nla_stg);
562563
return 0;

0 commit comments

Comments
 (0)