bpf: Fix distinct pointer types warning for ARCH=i386
Subsystems (3)
PATCH 1/1 bpf: Fix distinct pointer types warning for ARCH=i386
Fix a new warning reported by kbuild for make ARCH=i386:
In file included from kernel/bpf/cgroup.c:11:0:
kernel/bpf/cgroup.c: In function '__cgroup_bpf_run_filter_sysctl':
include/linux/kernel.h:827:29: warning: comparison of distinct pointer types lacks a cast
(!!(sizeof((typeof(x) *)1 == (typeof(y) *)1)))
^
include/linux/kernel.h:841:4: note: in expansion of macro '__typecheck'
(__typecheck(x, y) && __no_side_effects(x, y))
^~~~~~~~~~~
include/linux/kernel.h:851:24: note: in expansion of macro '__safe_cmp'
__builtin_choose_expr(__safe_cmp(x, y), \
^~~~~~~~~~
include/linux/kernel.h:860:19: note: in expansion of macro '__careful_cmp'
#define min(x, y) __careful_cmp(x, y, <)
^~~~~~~~~~~~~Quoted 1 line
Quoted 1 line
kernel/bpf/cgroup.c:837:17: note: in expansion of macro 'min'
ctx.new_len = min(PAGE_SIZE, *pcount);
^~~Fixes 4e63acdff864 ("bpf: Introduce bpf_sysctl_{get,set}_new_value helpers")
Signed-off-by Andrey Ignatov <[email protected]>
--- kernel/bpf/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/cgroup.c +1 -1
@@ -839,7 +839,7 @@ int __cgroup_bpf_run_filter_sysctl(struct ctl_table_header *head,* buffer bigger than provided by user. */ ctx.new_val =kmalloc_track_caller (PAGE_SIZE ,GFP_KERNEL ); - ctx.new_len =min (PAGE_SIZE , *pcount); + ctx.new_len =min_t (size_t,PAGE_SIZE , *pcount);if (!ctx.new_val ||copy_from_user (ctx.new_val, buf, ctx.new_len))/* Let BPF program decide how to proceed. */
Signature · 1 line
2.17.1
Alexei Starovoitov
AppliedQuoted 17 lines · Andrey Ignatov
Fix a new warning reported by kbuild for make ARCH=i386:
In file included from kernel/bpf/cgroup.c:11:0: kernel/bpf/cgroup.c: In function '__cgroup_bpf_run_filter_sysctl': include/linux/kernel.h:827:29: warning: comparison of distinct pointer types lacks a cast (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) ^ include/linux/kernel.h:841:4: note: in expansion of macro '__typecheck' (__typecheck(x, y) && __no_side_effects(x, y)) ^~~~~~~~~~~ include/linux/kernel.h:851:24: note: in expansion of macro '__safe_cmp' __builtin_choose_expr(__safe_cmp(x, y), \ ^~~~~~~~~~ include/linux/kernel.h:860:19: note: in expansion of macro '__careful_cmp' #define min(x, y) __careful_cmp(x, y, <) ^~~~~~~~~~~~~
Quoted 6 lines
Quoted 1 line
Quoted 1 line
kernel/bpf/cgroup.c:837:17: note: in expansion of macro 'min'ctx.new_len = min(PAGE_SIZE, *pcount); ^~~Fixes 4e63acdff864 ("bpf: Introduce bpf_sysctl_{get,set}_new_value helpers")Signed-off-by Andrey Ignatov <[email protected]>
Applied. Thanks for the quick fix.