Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bpf: Convert bpf_sock_addr_kern "uaddr" to sockaddr_unsized 

Change struct bpf_sock_addr_kern to use sockaddr_unsized for the "uaddr"
field instead of sockaddr. This improves type safety in the BPF cgroup
socket address filtering code.

The casting in __cgroup_bpf_run_filter_sock_addr() is updated to match the
new type, removing an unnecessary cast in the initialization and updating
the conditional assignment to use the appropriate sockaddr_unsized cast.

Additionally rename the "unspec" variable to "storage" to better align
with its usage.

No binary changes expected.

Signed-off-by: Kees Cook <kees@kernel.org>
Link: https://patch.msgid.link/20251104002617.2752303-7-kees@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Kees Cook 2025-11-03 16:26:15 -08:00 committed by Jakub Kicinski
parent 8116d803e7
commit c1a799eef6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/filter.h
View File

@ -1515,7 +1515,7 @@ static inline int bpf_tell_extensions(void)
struct bpf_sock_addr_kern { struct bpf_sock_addr_kern {
struct sock *sk; struct sock *sk;
struct sockaddr *uaddr; struct sockaddr_unsized *uaddr;
/* Temporary "register" to make indirect stores to nested structures /* Temporary "register" to make indirect stores to nested structures
* defined above. We need three registers to make such a store, but * defined above. We need three registers to make such a store, but
* only two (src and dst) are available at convert_ctx_access time * only two (src and dst) are available at convert_ctx_access time

8
kernel/bpf/cgroup.c
View File

@ -1673,10 +1673,10 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
{ {
struct bpf_sock_addr_kern ctx = { struct bpf_sock_addr_kern ctx = {
.sk = sk, .sk = sk,
.uaddr = (struct sockaddr *)uaddr, .uaddr = uaddr,
.t_ctx = t_ctx, .t_ctx = t_ctx,
}; };
struct sockaddr_storage unspec; struct sockaddr_storage storage;
struct cgroup *cgrp; struct cgroup *cgrp;
int ret; int ret;
@ -1688,8 +1688,8 @@ int __cgroup_bpf_run_filter_sock_addr(struct sock *sk,
return 0; return 0;
if (!ctx.uaddr) { if (!ctx.uaddr) {
memset(&unspec, 0, sizeof(unspec)); memset(&storage, 0, sizeof(storage));
ctx.uaddr = (struct sockaddr *)&unspec; ctx.uaddr = (struct sockaddr_unsized *)&storage;
ctx.uaddrlen = 0; ctx.uaddrlen = 0;
} else { } else {
ctx.uaddrlen = *uaddrlen; ctx.uaddrlen = *uaddrlen;