Skip to content

Commit c722a48

Browse files
Dan Carpenteropsiff
authored andcommitted
nfp: bpf: prevent integer overflow in nfp_bpf_event_output()
[ Upstream commit 16ebb6f ] The "sizeof(struct cmsg_bpf_event) + pkt_size + data_size" math could potentially have an integer wrapping bug on 32bit systems. Check for this and return an error. Fixes: 9816dd3 ("nfp: bpf: perf event output helpers support") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Link: https://patch.msgid.link/6074805b-e78d-4b8a-bf05-e929b5377c28@stanley.mountain Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> (cherry picked from commit 6fb280cace31024137fa79e5b2f2d64f4e352ddb)
1 parent a23cbe8 commit c722a48

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

  • drivers/net/ethernet/netronome/nfp/bpf

drivers/net/ethernet/netronome/nfp/bpf/offload.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,8 @@ int nfp_bpf_event_output(struct nfp_app_bpf *bpf, const void *data,
458458
map_id_full = be64_to_cpu(cbe->map_ptr);
459459
map_id = map_id_full;
460460

461-
if (len < sizeof(struct cmsg_bpf_event) + pkt_size + data_size)
461+
if (size_add(pkt_size, data_size) > INT_MAX ||
462+
len < sizeof(struct cmsg_bpf_event) + pkt_size + data_size)
462463
return -EINVAL;
463464
if (cbe->hdr.ver != NFP_CCM_ABI_VERSION)
464465
return -EINVAL;

0 commit comments

Comments
 (0)