bpf: Fix security_bpf_map_create error handling
Daniel Borkmann
maintainerPATCH 1/1 bpf: Fix security_bpf_map_create error handling
Commit 5816bf4273ed ("lsm,selinux: Add LSM blob support for BPF objects") made the LSM hook wrappers for BPF object creation clean up the LSM state internally upon denial, e.g. security_bpf_map_create() internally calls security_bpf_map_free() when the bpf_map_create hook returns an error. map_create() however still routes a denial to its free_map_sec label, which invokes security_bpf_map_free() a second time, so the bpf_map_free hook fires twice for a single denied map.
In-tree LSMs are unaffected in practice since the blob kfree() inside security_bpf_map_free() is NULL-safe and idempotent and none of them implement bpf_map_free, but a BPF LSM program attached to that hook observes double invocations. Route the denial to free_map instead.
--- kernel/bpf/syscall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/syscall.c +1 -1
@@ -1649,7 +1649,7 @@ static int map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_common_at err =security_bpf_map_create (map, attr, token, uattr.is_kernel);if (err) - goto free_map_sec; + goto free_map; err =bpf_map_alloc_id (map);if (err)
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [Medium] Incomplete fix: the double LSM hook invocation bug fixed for maps also exists in the BPF program load path. --
--- Patch [1]: [PATCH bpf-next] bpf: Fix security_bpf_map_create error handling --- commit cf9b2144a32439abed11faad9a9b189d6b3f71f7
Author: Daniel Borkmann <[email protected]>
bpf: Fix security_bpf_map_create error handling
This commit prevents the security_bpf_map_free() hook from being called twice when map creation is denied. It routes the map_create() denial path to free_map instead of free_map_sec.
kernel/bpf/syscall.c static int map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_common_at · line 1655
Quoted 12 lines
kernel/bpf/syscall.c +1
-1@@ -1649,7 +1649,7 @@ static int map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_common_at err =security_bpf_map_create (map, attr, token, uattr.is_kernel);if (err) - goto free_map_sec; + goto free_map; err =bpf_map_alloc_id (map);if (err)
[Severity: Medium]
This isn't a bug introduced by this patch, but since you are fixing the double invocation for maps, does the exact same issue also exist in the BPF program load path?
Looking at the program load path, security_bpf_prog_load() cleans up the LSM state internally upon denial:
security/security.c:security_bpf_prog_load() {
...
if (unlikely(rc))
security_bpf_prog_free(prog);
...
}However, the error path in bpf_prog_load() eventually initiates an unconditional program teardown:
kernel/bpf/syscall.c:bpf_prog_load() {
...
free_used_maps:
/* In case we have subprogs, we need to wait for a grace
* period before we can tear down JIT memory since symbols
* are already exposed under kallsyms.
*/
__bpf_prog_put_noref(prog, prog->aux->real_func_cnt);
...
}Which then unconditionally calls the free hook again:
kernel/bpf/syscall.c:__bpf_prog_put_rcu() {
...
security_bpf_prog_free(aux->prog);
...
}Could this lead to double invocations for denied programs (or unbalanced invocations if verification fails before reaching the LSM load hook), creating unexpected states for BPF LSM programs attached to bpf_prog_free?
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Daniel Borkmann
maintainerQuoted 4 lines · On 7/9/26 9:48 AM, [email protected] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [Medium] Incomplete fix: the double LSM hook invocation bug fixed for maps also exists in the BPF program load path.
Yeap, I'm on that one as well, but sending separately.
This patch was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Quoted 9 lines · On Thu, 9 Jul 2026 09:34:22 +0200 you wrote:
Commit
5816bf4273ed("lsm,selinux: Add LSM blob support for BPF objects") made the LSM hook wrappers for BPF object creation clean up the LSM state internally upon denial, e.g.security_bpf_map_create()internally callssecurity_bpf_map_free()when thebpf_map_createhook returns an error.map_create()however still routes a denial to itsfree_map_seclabel, which invokessecurity_bpf_map_free()a second time, so thebpf_map_freehook fires twice for a single denied map.[...]
Here is the summary with links:
- [bpf-next] bpf: Fix security_bpf_map_create error handling
https://git.kernel.org/bpf/bpf-next/c/36ffa86c42f9
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html