libbpf: Fix signed overflow in ringbuf_process_ring
authorBrendan Jackman <jackmanb@google.com>
Thu, 29 Apr 2021 13:05:10 +0000 (13:05 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 May 2021 08:13:06 +0000 (10:13 +0200)
commit4aae6eb6af7d1ac2ee5762077892185884d8f169
tree61411485974c2db101802d77a6a004b18320afc4
parent60bb2cecf47f642dcd5e51fc7cb3d7b29d670424
libbpf: Fix signed overflow in ringbuf_process_ring

[ Upstream commit 2a30f9440640c418bcfbea9b2b344d268b58e0a2 ]

One of our benchmarks running in (Google-internal) CI pushes data
through the ringbuf faster htan than userspace is able to consume
it. In this case it seems we're actually able to get >INT_MAX entries
in a single ring_buffer__consume() call. ASAN detected that cnt
overflows in this case.

Fix by using 64-bit counter internally and then capping the result to
INT_MAX before converting to the int return type. Do the same for
the ring_buffer__poll().

Fixes: bf99c936f947 (libbpf: Add BPF ring buffer support)
Signed-off-by: Brendan Jackman <jackmanb@google.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20210429130510.1621665-1-jackmanb@google.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/lib/bpf/ringbuf.c