]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: fix potential error return
authorAnton Protopopov <aspsk@isovalent.com>
Tue, 10 Dec 2024 11:42:45 +0000 (11:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Jan 2025 12:30:04 +0000 (13:30 +0100)
commit42de6037837b924022899fcd6b05270378ee611a
tree7999775a83cf347a940526ae6a9793f723d06929
parentced1bd92971d79fb1b47b3f58ed5cd137ac3b234
bpf: fix potential error return

[ Upstream commit c4441ca86afe4814039ee1b32c39d833c1a16bbc ]

The bpf_remove_insns() function returns WARN_ON_ONCE(error), where
error is a result of bpf_adj_branches(), and thus should be always 0
However, if for any reason it is not 0, then it will be converted to
boolean by WARN_ON_ONCE and returned to user space as 1, not an actual
error value. Fix this by returning the original err after the WARN check.

Signed-off-by: Anton Protopopov <aspsk@isovalent.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20241210114245.836164-1-aspsk@isovalent.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/bpf/core.c