Re: [PATCH v2] bpf: Add length check for SK_DIAG_BPF_STORAGE_REQ_MAP_FD parsing

From: Martin KaFai Lau
Date: Fri Jul 28 2023 - 19:57:59 EST


On 7/27/23 12:34 AM, Paolo Abeni wrote:
On Tue, 2023-07-25 at 10:33 +0800, Lin Ma wrote:
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: 1ed4d92458a9 ("bpf: INET_DIAG support in bpf_sk_storage")
Suggested-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Lin Ma <linma@xxxxxxxxxx>

I guess this should go via the ebpf tree, right? Setting the delegate
accordingly.

Already applied to the bpf tree. Thanks.
pw-bot seems not doing auto-reply for the bpf tree.