bpf: Require frozen map for calculating map hash
PATCH 1/1 bpf: Require frozen map for calculating map hash
Currently, bpf_map_get_info_by_fd calculates and caches the hash of the map regardless of the map's frozen state.
This leads to a TOCTOU bug where userspace can call BPF_OBJ_GET_INFO_BY_FD to cache the hash and then modify the map contents before freezing.
Therefore, a trusted loader can be tricked into verifying the stale hash while loading the modified contents.
Fix this by returning -EPERM if the map is not frozen when the hash is requested. This ensures the hash is only generated for the final, immutable state of the map.
--- kernel/bpf/syscall.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/bpf/syscall.c +3 -0
@@ -5310,6 +5310,9 @@ static int bpf_map_get_info_by_fd(struct file *file,if (info.hash_size !=SHA256_DIGEST_SIZE )return -EINVAL ; +if (!READ_ONCE (map->frozen)) +return -EPERM ; + err = map->ops->map_get_hash (map,SHA256_DIGEST_SIZE , map->sha);if (err !=0 )return err;
Signature · 1 line
2.43.0
Quoted 10 lines · KP Singh
Currently,
bpf_map_get_info_by_fdcalculates and caches the hash of the map regardless of the map's frozen state.This leads to a TOCTOU bug where userspace can call
BPF_OBJ_GET_INFO_BY_FDto cache the hash and then modify the map contents before freezing.Therefore, a trusted loader can be tricked into verifying the stale hash while loading the modified contents.
Quoted 7 lines
Fix this by returning
-EPERMif the map is not frozen when the hash is requested. This ensures the hash is only generated for the final, immutable state of the map.Fixes ea2e6467ac36 ("bpf: Return hashes of maps in BPF_OBJ_GET_INFO_BY_FD")Reported-by Toshi Piazza <[email protected]>Signed-off-by KP Singh <[email protected]>
[ tree would be bpf-next ]
Could you later also follow-up with a small BPF selftest?
Thanks,
Daniel
Alexei Starovoitov
AppliedQuoted 16 lines · Daniel Borkmann
Quoted 14 lines · KP Singh
Currently,
bpf_map_get_info_by_fdcalculates and caches the hash of the map regardless of the map's frozen state.This leads to a TOCTOU bug where userspace can call
BPF_OBJ_GET_INFO_BY_FDto cache the hash and then modify the map contents before freezing.Therefore, a trusted loader can be tricked into verifying the stale hash while loading the modified contents.
Fix this by returning
-EPERMif the map is not frozen when the hash is requested. This ensures the hash is only generated for the final, immutable state of the map.
Quoted 7 lines
Quoted 3 lines
Fixes ea2e6467ac36 ("bpf: Return hashes of maps in BPF_OBJ_GET_INFO_BY_FD")Reported-by Toshi Piazza <[email protected]>Signed-off-by KP Singh <[email protected]>[ tree would be bpf-next ]
Acked-by Daniel Borkmann <[email protected]>
Applied. pw-bot is down.