[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240418010723.3069001-1-edliaw@google.com>
Date: Thu, 18 Apr 2024 01:07:09 +0000
From: Edward Liaw <edliaw@...gle.com>
To: stable@...r.kernel.org, Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>, Andrii Nakryiko <andrii@...nel.org>,
Martin KaFai Lau <kafai@...com>, Song Liu <songliubraving@...com>, Yonghong Song <yhs@...com>,
John Fastabend <john.fastabend@...il.com>, KP Singh <kpsingh@...nel.org>,
Hao Luo <haoluo@...gle.com>
Cc: bpf@...r.kernel.org, kernel-team@...roid.com,
Edward Liaw <edliaw@...gle.com>, netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH 5.15.y v2 0/5] Backport bounds checks for bpf
These backports fix CVE-2021-4204, CVE-2022-23222 for 5.15.y.
This includes a conflict resolution with 45ce4b4f9009 ("bpf: Fix crash
due to out of bounds access into reg2btf_ids.") which was cherry-picked
previously.
Link: https://lore.kernel.org/all/20220428235751.103203-11-haoluo@google.com/
They were tested on 5.15.94 to pass LTP test bpf_prog06 with no
regressions from the bpf selftests.
v2:
Made a mistake of not including the out of bounds reg2btf_ids fix
Daniel Borkmann (4):
bpf: Generalize check_ctx_reg for reuse with other types
bpf: Generally fix helper register offset check
bpf: Fix out of bounds access for ringbuf helpers
bpf: Fix ringbuf memory type confusion when passing to helpers
Kumar Kartikeya Dwivedi (1):
bpf: Extend kfunc with PTR_TO_CTX, PTR_TO_MEM argument support
include/linux/bpf.h | 9 +++-
include/linux/bpf_verifier.h | 4 +-
kernel/bpf/btf.c | 93 ++++++++++++++++++++++++++++--------
kernel/bpf/verifier.c | 66 +++++++++++++++++--------
4 files changed, 129 insertions(+), 43 deletions(-)
--
2.44.0.769.g3c40516874-goog
Powered by blists - more mailing lists