# git rev-parse -q --verify 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91^{commit} 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 already have revision, skipping fetch # git checkout -q -f -B kisskb 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 # git clean -qxdf # < git log -1 # commit 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 # Author: Kees Cook # Date: Fri Mar 30 18:52:36 2018 -0700 # # kernel.h: Retain constant expression output for max()/min() # # In the effort to remove all VLAs from the kernel[1], it is desirable to # build with -Wvla. However, this warning is overly pessimistic, in that # it is only happy with stack array sizes that are declared as constant # expressions, and not constant values. One case of this is the # evaluation of the max() macro which, due to its construction, ends up # converting constant expression arguments into a constant value result. # # All attempts to rewrite this macro with __builtin_constant_p() failed # with older compilers (e.g. gcc 4.4)[2]. However, Martin Uecker, # constructed[3] a mind-shattering solution that works everywhere. # Cthulhu fhtagn! # # This patch updates the min()/max() macros to evaluate to a constant # expression when called on constant expression arguments. This removes # several false-positive stack VLA warnings from an x86 allmodconfig build # when -Wvla is added: # # $ diff -u before.txt after.txt | grep ^- # -drivers/input/touchscreen/cyttsp4_core.c:871:2: warning: ISO C90 forbids variable length array ‘ids’ [-Wvla] # -fs/btrfs/tree-checker.c:344:4: warning: ISO C90 forbids variable length array ‘namebuf’ [-Wvla] # -lib/vsprintf.c:747:2: warning: ISO C90 forbids variable length array ‘sym’ [-Wvla] # -net/ipv4/proc.c:403:2: warning: ISO C90 forbids variable length array ‘buff’ [-Wvla] # -net/ipv6/proc.c:198:2: warning: ISO C90 forbids variable length array ‘buff’ [-Wvla] # -net/ipv6/proc.c:218:2: warning: ISO C90 forbids variable length array ‘buff64’ [-Wvla] # # This also updates two cases where different enums were being compared # and explicitly casts them to int (which matches the old side-effect of # the single-evaluation code): one in tpm/tpm_tis_core.h, and one in # drm/drm_color_mgmt.c. # # [1] https://lkml.org/lkml/2018/3/7/621 # [2] https://lkml.org/lkml/2018/3/10/170 # [3] https://lkml.org/lkml/2018/3/20/845 # # Co-Developed-by: Linus Torvalds # Co-Developed-by: Martin Uecker # Signed-off-by: Kees Cook # Acked-by: Ingo Molnar # Acked-by: Miguel Ojeda # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < git log --format=%s --max-count=1 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 # < make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_44x_fsp2_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- 44x/fsp2_defconfig # make -s -j 10 ARCH=powerpc O=/kisskb/build/linus_44x_fsp2_defconfig_powerpc-5.3 CROSS_COMPILE=/opt/cross/kisskb/gcc-5.3.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/kernel/bpf/syscall.c:1229:12: warning: 'bpf_prog_attach_check_attach_type' defined but not used [-Wunused-function] static int bpf_prog_attach_check_attach_type(const struct bpf_prog *prog, ^ INFO: Uncompressed kernel (size 0x8f097c) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0x900000) Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 09:42:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 3916849 Bytes = 3825.05 kB = 3.74 MB Load Address: 00000000 Entry Point: 00000000 Completed OK # rm -rf /kisskb/build/linus_44x_fsp2_defconfig_powerpc-5.3 # Build took: 0:01:12.435029