mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git/
synced 2026-04-17 22:23:45 -04:00
Merge tag 'bpf-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Pull bpf updates from Alexei Starovoitov:
"For this merge window we're splitting BPF pull request into three for
higher visibility: main changes, res_spin_lock, try_alloc_pages.
These are the main BPF changes:
- Add DFA-based live registers analysis to improve verification of
programs with loops (Eduard Zingerman)
- Introduce load_acquire and store_release BPF instructions and add
x86, arm64 JIT support (Peilin Ye)
- Fix loop detection logic in the verifier (Eduard Zingerman)
- Drop unnecesary lock in bpf_map_inc_not_zero() (Eric Dumazet)
- Add kfunc for populating cpumask bits (Emil Tsalapatis)
- Convert various shell based tests to selftests/bpf/test_progs
format (Bastien Curutchet)
- Allow passing referenced kptrs into struct_ops callbacks (Amery
Hung)
- Add a flag to LSM bpf hook to facilitate bpf program signing
(Blaise Boscaccy)
- Track arena arguments in kfuncs (Ihor Solodrai)
- Add copy_remote_vm_str() helper for reading strings from remote VM
and bpf_copy_from_user_task_str() kfunc (Jordan Rome)
- Add support for timed may_goto instruction (Kumar Kartikeya
Dwivedi)
- Allow bpf_get_netns_cookie() int cgroup_skb programs (Mahe Tardy)
- Reduce bpf_cgrp_storage_busy false positives when accessing cgroup
local storage (Martin KaFai Lau)
- Introduce bpf_dynptr_copy() kfunc (Mykyta Yatsenko)
- Allow retrieving BTF data with BTF token (Mykyta Yatsenko)
- Add BPF kfuncs to set and get xattrs with 'security.bpf.' prefix
(Song Liu)
- Reject attaching programs to noreturn functions (Yafang Shao)
- Introduce pre-order traversal of cgroup bpf programs (Yonghong
Song)"
* tag 'bpf-next-6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next: (186 commits)
selftests/bpf: Add selftests for load-acquire/store-release when register number is invalid
bpf: Fix out-of-bounds read in check_atomic_load/store()
libbpf: Add namespace for errstr making it libbpf_errstr
bpf: Add struct_ops context information to struct bpf_prog_aux
selftests/bpf: Sanitize pointer prior fclose()
selftests/bpf: Migrate test_xdp_vlan.sh into test_progs
selftests/bpf: test_xdp_vlan: Rename BPF sections
bpf: clarify a misleading verifier error message
selftests/bpf: Add selftest for attaching fexit to __noreturn functions
bpf: Reject attaching fexit/fmod_ret to __noreturn functions
bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage
bpf: Make perf_event_read_output accessible in all program types.
bpftool: Using the right format specifiers
bpftool: Add -Wformat-signedness flag to detect format errors
selftests/bpf: Test freplace from user namespace
libbpf: Pass BPF token from find_prog_btf_id to BPF_BTF_GET_FD_BY_ID
bpf: Return prog btf_id without capable check
bpf: BPF token support for BPF_BTF_GET_FD_BY_ID
bpf, x86: Fix objtool warning for timed may_goto
bpf: Check map->record at the beginning of check_and_free_fields()
...
This commit is contained in:
@@ -5627,6 +5627,7 @@ int security_audit_rule_match(struct lsm_prop *prop, u32 field, u32 op,
|
||||
* @cmd: command
|
||||
* @attr: bpf attribute
|
||||
* @size: size
|
||||
* @kernel: whether or not call originated from kernel
|
||||
*
|
||||
* Do a initial check for all bpf syscalls after the attribute is copied into
|
||||
* the kernel. The actual security module can implement their own rules to
|
||||
@@ -5634,9 +5635,9 @@ int security_audit_rule_match(struct lsm_prop *prop, u32 field, u32 op,
|
||||
*
|
||||
* Return: Returns 0 if permission is granted.
|
||||
*/
|
||||
int security_bpf(int cmd, union bpf_attr *attr, unsigned int size)
|
||||
int security_bpf(int cmd, union bpf_attr *attr, unsigned int size, bool kernel)
|
||||
{
|
||||
return call_int_hook(bpf, cmd, attr, size);
|
||||
return call_int_hook(bpf, cmd, attr, size, kernel);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -5673,6 +5674,7 @@ int security_bpf_prog(struct bpf_prog *prog)
|
||||
* @map: BPF map object
|
||||
* @attr: BPF syscall attributes used to create BPF map
|
||||
* @token: BPF token used to grant user access
|
||||
* @kernel: whether or not call originated from kernel
|
||||
*
|
||||
* Do a check when the kernel creates a new BPF map. This is also the
|
||||
* point where LSM blob is allocated for LSMs that need them.
|
||||
@@ -5680,9 +5682,9 @@ int security_bpf_prog(struct bpf_prog *prog)
|
||||
* Return: Returns 0 on success, error on failure.
|
||||
*/
|
||||
int security_bpf_map_create(struct bpf_map *map, union bpf_attr *attr,
|
||||
struct bpf_token *token)
|
||||
struct bpf_token *token, bool kernel)
|
||||
{
|
||||
return call_int_hook(bpf_map_create, map, attr, token);
|
||||
return call_int_hook(bpf_map_create, map, attr, token, kernel);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -5690,6 +5692,7 @@ int security_bpf_map_create(struct bpf_map *map, union bpf_attr *attr,
|
||||
* @prog: BPF program object
|
||||
* @attr: BPF syscall attributes used to create BPF program
|
||||
* @token: BPF token used to grant user access to BPF subsystem
|
||||
* @kernel: whether or not call originated from kernel
|
||||
*
|
||||
* Perform an access control check when the kernel loads a BPF program and
|
||||
* allocates associated BPF program object. This hook is also responsible for
|
||||
@@ -5698,9 +5701,9 @@ int security_bpf_map_create(struct bpf_map *map, union bpf_attr *attr,
|
||||
* Return: Returns 0 on success, error on failure.
|
||||
*/
|
||||
int security_bpf_prog_load(struct bpf_prog *prog, union bpf_attr *attr,
|
||||
struct bpf_token *token)
|
||||
struct bpf_token *token, bool kernel)
|
||||
{
|
||||
return call_int_hook(bpf_prog_load, prog, attr, token);
|
||||
return call_int_hook(bpf_prog_load, prog, attr, token, kernel);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user