# 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-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < git log --format=%s --max-count=1 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 # < make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- randconfig KCONFIG_SEED=0x1EF47FE0 # Added to kconfig CONFIG_STANDALONE=y # yes \n | make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- oldconfig yes: standard output: Broken pipe yes: write error # make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1317:2: warning: #warning syscall pkey_mprotect not implemented [-Wcpp] :1320:2: warning: #warning syscall pkey_alloc not implemented [-Wcpp] :1323:2: warning: #warning syscall pkey_free not implemented [-Wcpp] :1326:2: warning: #warning syscall statx not implemented [-Wcpp] /kisskb/tmp/ccqdunho.s: Assembler messages: /kisskb/tmp/ccqdunho.s: Internal error, aborting at /home/tony/buildall/src/binutils/gas/config/tc-sh.c line 4052 in md_apply_fix Please report this bug. /kisskb/src/scripts/Makefile.build:413: recipe for target 'arch/sh/kernel/cpu/sh2a/ex.o' failed make[4]: *** [arch/sh/kernel/cpu/sh2a/ex.o] Error 1 /kisskb/src/scripts/Makefile.build:546: recipe for target 'arch/sh/kernel/cpu/sh2a' failed make[3]: *** [arch/sh/kernel/cpu/sh2a] Error 2 /kisskb/src/scripts/Makefile.build:546: recipe for target 'arch/sh/kernel/cpu' failed make[2]: *** [arch/sh/kernel/cpu] Error 2 /kisskb/src/Makefile:1057: recipe for target 'arch/sh/kernel' failed make[1]: *** [arch/sh/kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... /kisskb/src/kernel/cgroup/cgroup-v1.c: In function 'cgroup1_mount': /kisskb/src/kernel/cgroup/cgroup-v1.c:1268:20: warning: 'root' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:183:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/fs/ocfs2/file.c:2386:3: warning: value computed is not used [-Wunused-value] Makefile:146: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -s -j 8 ARCH=sh O=/kisskb/build/linus_sh-randconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-randconfig_sh4 # Build took: 0:00:58.504739