# 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/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 # < make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- mpc85xx_defconfig # make -s -j 48 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- /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/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/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2497:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1819:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/mm/hugetlb.c: In function 'alloc_pool_huge_page': /kisskb/src/mm/hugetlb.c:1440:5: warning: 'page' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/codecs/wm8960.c: In function 'wm8960_configure_clocking': /kisskb/src/sound/soc/codecs/wm8960.c:803:70: warning: 'j' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/sound/soc/codecs/wm8960.c:800:68: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] /kisskb/src/drivers/tty/serial/8250/8250_core.c: In function 'univ8250_release_irq': /kisskb/src/drivers/tty/serial/8250/8250_core.c:251:18: warning: 'i' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/tty/serial/8250/8250_core.c:231:19: note: 'i' was declared here INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb53364) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) INFO: Uncompressed kernel (size 0xb42c18) overlaps the address of the wrapper(0x400000) INFO: Fixing the link_address of wrapper to (0xc00000) Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5459508 Bytes = 5331.55 kB = 5.21 MB Load Address: 00000000 Entry Point: 00000000 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483540 Bytes = 5355.02 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:11 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483289 Bytes = 5354.77 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5484789 Bytes = 5356.24 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5484400 Bytes = 5355.86 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483115 Bytes = 5354.60 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5484621 Bytes = 5356.08 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483124 Bytes = 5354.61 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483142 Bytes = 5354.63 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483068 Bytes = 5354.56 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483427 Bytes = 5354.91 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483126 Bytes = 5354.62 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00288 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483293 Bytes = 5354.78 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:12 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5484402 Bytes = 5355.86 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:13 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483436 Bytes = 5354.92 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Image Name: Linux-4.16.0-g3c8ba0d Created: Fri Apr 6 08:44:13 2018 Image Type: PowerPC Linux Kernel Image (gzip compressed) Data Size: 5483792 Bytes = 5355.27 kB = 5.23 MB Load Address: 00c00000 Entry Point: 00c00248 Completed OK # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc # Build took: 0:01:29.265714