# git rev-parse -q --verify 1c24a186398f59c80adb9a967486b65c1423a59d^{commit} 1c24a186398f59c80adb9a967486b65c1423a59d already have revision, skipping fetch # git checkout -q -f -B kisskb 1c24a186398f59c80adb9a967486b65c1423a59d # git clean -qxdf # < git log -1 # commit 1c24a186398f59c80adb9a967486b65c1423a59d # Author: Linus Torvalds # Date: Tue Mar 29 15:06:39 2022 -0700 # # fs: fd tables have to be multiples of BITS_PER_LONG # # This has always been the rule: fdtables have several bitmaps in them, # and as a result they have to be sized properly for bitmaps. We walk # those bitmaps in chunks of 'unsigned long' in serveral cases, but even # when we don't, we use the regular kernel bitops that are defined to work # on arrays of 'unsigned long', not on some byte array. # # Now, the distinction between arrays of bytes and 'unsigned long' # normally only really ends up being noticeable on big-endian systems, but # Fedor Pchelkin and Alexey Khoroshilov reported that copy_fd_bitmaps() # could be called with an argument that wasn't even a multiple of # BITS_PER_BYTE. And then it fails to do the proper copy even on # little-endian machines. # # The bug wasn't in copy_fd_bitmap(), but in sane_fdtable_size(), which # didn't actually sanitize the fdtable size sufficiently, and never made # sure it had the proper BITS_PER_LONG alignment. # # That's partly because the alignment historically came not from having to # explicitly align things, but simply from previous fdtable sizes, and # from count_open_files(), which counts the file descriptors by walking # them one 'unsigned long' word at a time and thus naturally ends up doing # sizing in the proper 'chunks of unsigned long'. # # But with the introduction of close_range(), we now have an external # source of "this is how many files we want to have", and so # sane_fdtable_size() needs to do a better job. # # This also adds that explicit alignment to alloc_fdtable(), although # there it is mainly just for documentation at a source code level. The # arithmetic we do there to pick a reasonable fdtable size already aligns # the result sufficiently. # # In fact,clang notices that the added ALIGN() in that function doesn't # actually do anything, and does not generate any extra code for it. # # It turns out that gcc ends up confusing itself by combining a previous # constant-sized shift operation with the variable-sized shift operations # in roundup_pow_of_two(). And probably due to that doesn't notice that # the ALIGN() is a no-op. But that's a (tiny) gcc misfeature that doesn't # matter. Having the explicit alignment makes sense, and would actually # matter on a 128-bit architecture if we ever go there. # # This also adds big comments above both functions about how fdtable sizes # have to have that BITS_PER_LONG alignment. # # Fixes: 60997c3d45d9 ("close_range: add CLOSE_RANGE_UNSHARE") # Reported-by: Fedor Pchelkin # Reported-by: Alexey Khoroshilov # Link: https://lore.kernel.org/all/20220326114009.1690-1-aissur0002@gmail.com/ # Tested-and-acked-by: Christian Brauner # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 1c24a186398f59c80adb9a967486b65c1423a59d # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- randconfig # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_CPU_BIG_ENDIAN=y # Added to kconfig CONFIG_PPC64=y # Added to kconfig CONFIG_PPC_DISABLE_WERROR=y # Added to kconfig CONFIG_SECTION_MISMATCH_WARN_ONLY=y # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # Added to kconfig CONFIG_CC_STACKPROTECTOR_STRONG=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_LD_HEAD_STUB_CATCH=y # Added to kconfig CONFIG_TRIM_UNUSED_KSYMS=n # Added to kconfig CONFIG_UBSAN=n # < make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig .config:4578:warning: override: reassigning to symbol STANDALONE .config:4580:warning: override: reassigning to symbol MODULE_SIG .config:4582:warning: override: reassigning to symbol PPC64 .config:4585:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD .config:4587:warning: override: reassigning to symbol GCC_PLUGINS # make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/drivers/tty/serial/8250/8250_aspeed_vuart.c: In function 'aspeed_vuart_probe': /kisskb/src/drivers/tty/serial/8250/8250_aspeed_vuart.c:568:1: error: the frame size of 1056 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] 568 | } | ^ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:289: drivers/tty/serial/8250/8250_aspeed_vuart.o] Error 1 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/tty/serial/8250] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/tty/serial] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:551: drivers/tty] Error 2 make[2]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/fs/binfmt_elf.c:2349: /kisskb/src/fs/binfmt_elf_test.c: In function 'total_mapping_size_test': /kisskb/src/fs/binfmt_elf_test.c:52:1: error: the frame size of 1104 bytes is larger than 1024 bytes [-Werror=frame-larger-than=] 52 | } | ^ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:289: fs/binfmt_elf.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1830: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1830: fs] Error 2 make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=powerpc O=/kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_powerpc-randconfig_powerpc-gcc11 # Build took: 0:02:53.014125