bpf: Fix concurrent regression in map_create()
PATCH v2 1/1 bpf: Fix concurrent regression in map_create()
Because there is time gap between bpf_map_new_fd() and close_fd(), a concurrent thread is able to close the new fd and opens a new, unrelated file with the exact same fd number. Thereafter, this close_fd() might inadvertently close the unrelated file.
To avoid such regression, do finalize log before security_bpf_map_create().
However, in order to achieve it, move bpf_get_file_flag(), security_bpf_map_create(), bpf_map_alloc_id(), and bpf_map_new_fd() from __map_create() to map_create(). And, rename __map_create() to map_create_alloc() meanwhile.
Then, in order to reuse the map and token when all checks pass in map_create_alloc(), pass "struct bpf_map **" and "struct bpf_token **" to map_create_alloc().
---
v1 -> v2:
* Finalize log before security_bpf_map_create() (per Alexei).
* v1: https://lore.kernel.org/bpf/[email protected]/
--- kernel/bpf/syscall.c | 80 ++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 33 deletions(-)
kernel/bpf/syscall.c +47 -33
@@ -1359,7 +1359,8 @@ static int map_check_btf(struct bpf_map *map, struct bpf_token *token,#define BPF_MAP_CREATE_LAST_FIELD excl_prog_hash_size/* called via syscall */ -static int __map_create (union bpf_attr *attr,bpfptr_t uattr,struct bpf_verifier_log *log) +static int map_create_alloc (union bpf_attr *attr,bpfptr_t uattr,struct bpf_verifier_log *log, +struct bpf_map **mapp,struct bpf_token **tokenp) {const struct bpf_map_ops *ops;struct bpf_token *token =NULL ;
@@ -1367,7 +1368,6 @@ static int __map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_verifieu32 map_type = attr->map_type;struct bpf_map *map;bool token_flag; -int f_flags;int err; err =CHECK_ATTR (BPF_MAP_CREATE );
@@ -1403,10 +1403,6 @@ static int __map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_verifiereturn -EINVAL ; } - f_flags =bpf_get_file_flag (attr->map_flags); -if (f_flags <0 ) -return f_flags; -if (numa_node !=NUMA_NO_NODE && ((unsigned int )numa_node >= nr_node_ids || !node_online (numa_node))) {
@@ -1598,6 +1594,49 @@ static int __map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_verifie goto free_map; } + *mapp = map; + *tokenp = token; +return 0 ; + +free_map: +bpf_map_free (map); +put_token: +bpf_token_put (token); +return err; +} + +static int map_create (union bpf_attr *attr,bpfptr_t uattr,struct bpf_common_attr *attr_common, +bpfptr_t uattr_common,u32 size_common) +{ +struct bpf_token *token =NULL ; +struct bpf_verifier_log *log; +struct bpf_log_attr attr_log; +struct bpf_map *map =NULL ; +int err, ret; +int f_flags; + + log =bpf_log_attr_create_vlog (&attr_log, attr_common, uattr_common, size_common); +if (IS_ERR (log)) +return PTR_ERR (log); + + err =map_create_alloc (attr, uattr, log, &map, &token); + +/* preserve original error even if log finalization is successful */ + ret =bpf_log_attr_finalize (&attr_log, log); +if (ret) + err = ret; + +kfree (log); + +if (err) + goto free_map; + + f_flags =bpf_get_file_flag (attr->map_flags); +if (f_flags <0 ) { + err = f_flags; + goto free_map; + } + err =security_bpf_map_create (map, attr, token, uattr.is_kernel);if (err) goto free_map_sec;
@@ -1626,37 +1665,12 @@ static int __map_create(union bpf_attr *attr, bpfptr_t uattr, struct bpf_verifie free_map_sec:security_bpf_map_free (map); free_map: -bpf_map_free (map); -put_token: +if (map) +bpf_map_free (map);bpf_token_put (token);return err; } -static int map_create (union bpf_attr *attr,bpfptr_t uattr,struct bpf_common_attr *attr_common, -bpfptr_t uattr_common,u32 size_common) -{ -struct bpf_verifier_log *log; -struct bpf_log_attr attr_log; -int err, ret; - - log =bpf_log_attr_create_vlog (&attr_log, attr_common, uattr_common, size_common); -if (IS_ERR (log)) -return PTR_ERR (log); - - err =__map_create (attr, uattr, log); - -/* preserve original error even if log finalization is successful */ - ret =bpf_log_attr_finalize (&attr_log, log); -if (ret) { -if (err >=0 ) -close_fd (err); - err = ret; - } - -kfree (log); -return err; -} -void bpf_map_inc (struct bpf_map *map) {atomic64_inc (&map->refcnt);
Signature · 1 line
2.54.0
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This patch was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Thu, 21 May 2026 22:29:09 +0800 you wrote:
Because there is time gap between
bpf_map_new_fd()andclose_fd(), a concurrent thread is able to close the new fd and opens a new, unrelated file with the exact same fd number. Thereafter, thisclose_fd()might inadvertently close the unrelated file.To avoid such regression, do finalize log before
security_bpf_map_create().[...]
Here is the summary with links:
- [bpf-next,v2] bpf: Fix concurrent regression in map_create()
https://git.kernel.org/bpf/bpf-next/c/9b435d23f51e
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html