From: Jiri Olsa Date: Mon, 30 Mar 2026 21:03:44 +0000 (+0200) Subject: bpf: Fix block device hooks names X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9eccdd38fb50b0fab24dd29497e50d0c0425cc84;p=thirdparty%2Flinux.git bpf: Fix block device hooks names Use proper names for block device hooks names. Fixes: 46df585fcff7 ("bpf: classify block device hooks appropriately") Reported-by: Venkat Rao Bagalkote Closes: https://lore.kernel.org/bpf/acrVKUy_EPiFFmV9@krava/T/#m7c7906a1ff4029e29185aec3266dbf5c8996dbf7 Signed-off-by: Jiri Olsa Signed-off-by: Daniel Borkmann Tested-by: Venkat Rao Bagalkote Reviewed-by: Christian Brauner Acked-by: Song Liu Link: https://lore.kernel.org/bpf/20260330210344.3073712-1-jolsa@kernel.org --- diff --git a/kernel/bpf/bpf_lsm.c b/kernel/bpf/bpf_lsm.c index 119e3942cf5a..0e74325d96a6 100644 --- a/kernel/bpf/bpf_lsm.c +++ b/kernel/bpf/bpf_lsm.c @@ -383,7 +383,7 @@ BTF_ID(func, bpf_lsm_task_prctl) BTF_ID(func, bpf_lsm_task_setscheduler) BTF_ID(func, bpf_lsm_task_to_inode) BTF_ID(func, bpf_lsm_userns_create) -BTF_ID(func, bpf_lsm_bdev_alloc) +BTF_ID(func, bpf_lsm_bdev_alloc_security) BTF_ID(func, bpf_lsm_bdev_setintegrity) BTF_SET_END(sleepable_lsm_hooks) @@ -397,8 +397,8 @@ BTF_ID(func, bpf_lsm_sk_alloc_security) BTF_ID(func, bpf_lsm_sk_free_security) #endif /* CONFIG_SECURITY_NETWORK */ BTF_ID(func, bpf_lsm_task_free) -BTF_ID(func, bpf_lsm_bdev_alloc) -BTF_ID(func, bpf_lsm_bdev_free) +BTF_ID(func, bpf_lsm_bdev_alloc_security) +BTF_ID(func, bpf_lsm_bdev_free_security) BTF_SET_END(untrusted_lsm_hooks) bool bpf_lsm_is_sleepable_hook(u32 btf_id)