From: Alexei Starovoitov Date: Thu, 16 Apr 2026 22:20:27 +0000 (-0700) Subject: Merge branch 'bpf-fix-null-deref-when-storing-scalar-into-kptr-slot' X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=766bf026d0da242a329b402c436c8e4cfa2008d8;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'bpf-fix-null-deref-when-storing-scalar-into-kptr-slot' Mykyta Yatsenko says: ==================== bpf: Fix NULL deref when storing scalar into kptr slot map_kptr_match_type() accesses reg->btf before confirming the register is PTR_TO_BTF_ID. A scalar store into a kptr slot has no btf, causing a NULL pointer dereference. Guard base_type() first. Signed-off-by: Mykyta Yatsenko ==================== Link: https://patch.msgid.link/20260416-kptr_crash-v1-0-5589356584b4@meta.com Signed-off-by: Alexei Starovoitov --- 766bf026d0da242a329b402c436c8e4cfa2008d8