Skip to content

Commit bcc29b7

Browse files
f0rm2l1nMartin KaFai Lau
authored andcommitted
bpf: Add length check for SK_DIAG_BPF_STORAGE_REQ_MAP_FD parsing
The nla_for_each_nested parsing in function bpf_sk_storage_diag_alloc does not check the length of the nested attribute. This can lead to an out-of-attribute read and allow a malformed nlattr (e.g., length 0) to be viewed as a 4 byte integer. This patch adds an additional check when the nlattr is getting counted. This makes sure the latter nla_get_u32 can access the attributes with the correct length. Fixes: 1ed4d92 ("bpf: INET_DIAG support in bpf_sk_storage") Suggested-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Lin Ma <linma@zju.edu.cn> Reviewed-by: Jakub Kicinski <kuba@kernel.org> Link: https://lore.kernel.org/r/20230725023330.422856-1-linma@zju.edu.cn Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
1 parent aa89592 commit bcc29b7

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

net/core/bpf_sk_storage.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,11 @@ bpf_sk_storage_diag_alloc(const struct nlattr *nla_stgs)
496496
return ERR_PTR(-EPERM);
497497

498498
nla_for_each_nested(nla, nla_stgs, rem) {
499-
if (nla_type(nla) == SK_DIAG_BPF_STORAGE_REQ_MAP_FD)
499+
if (nla_type(nla) == SK_DIAG_BPF_STORAGE_REQ_MAP_FD) {
500+
if (nla_len(nla) != sizeof(u32))
501+
return ERR_PTR(-EINVAL);
500502
nr_maps++;
503+
}
501504
}
502505

503506
diag = kzalloc(struct_size(diag, maps, nr_maps), GFP_KERNEL);

0 commit comments

Comments
 (0)