shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge beff507e9e ("s390/cpum_sf: Remove WARN_ON_ONCE statements") into android14-6.1-lts

Browse Source 
Steps on the way to 6.1.113

Resolves merge conflicts in:
	fs/erofs/fscache.c
	fs/erofs/inode.c
	fs/erofs/zdata.c
	kernel/sched/psi.c

Change-Id: Icbb83e1d8d4b65f380f36046a6e98e341c53d77d
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2024-11-13 15:19:22 +00:00
parent 0eefe2e6a1 beff507e9e
commit ff83a68a27
254 changed files with 2887 additions and 2881 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/bpf/arraymap.c
View File

@@ -73,6 +73,9 @@ int array_map_alloc_check(union bpf_attr *attr)
/* avoid overflow on round_up(map->value_size) */
if (attr->value_size > INT_MAX)
return -E2BIG;
/* percpu map value size is bound by PCPU_MIN_UNIT_SIZE */
if (percpu && round_up(attr->value_size, 8) > PCPU_MIN_UNIT_SIZE)
return -E2BIG;
return 0;
}