# 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-10.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 1c24a186398f59c80adb9a967486b65c1423a59d # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc10 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-10.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:592, from /kisskb/src/include/asm-generic/hardirq.h:17, from /kisskb/src/arch/sh/include/asm/hardirq.h:9, from /kisskb/src/include/linux/hardirq.h:11, from /kisskb/src/include/linux/interrupt.h:11, from /kisskb/src/include/linux/serial_core.h:13, from /kisskb/src/include/linux/serial_sci.h:6, from /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:11: /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:105:24: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:106:2: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:2: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:100:63: warning: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Wsizeof-pointer-div] 100 | #define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) | ^ /kisskb/src/include/linux/sh_intc.h:107:27: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:8: note: in expansion of macro 'INTC_HW_DESC' 124 | .hw = INTC_HW_DESC(vectors, groups, mask_regs, \ | ^~~~~~~~~~~~ /kisskb/src/arch/sh/kernel/cpu/sh2/setup-sh7619.c:58:8: note: in expansion of macro 'DECLARE_INTC_DESC' 58 | static DECLARE_INTC_DESC(intc_desc, "sh7619", vectors, NULL, | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/tty/serial/sh-sci.c: In function 'sci_remap_port': /kisskb/src/drivers/tty/serial/sh-sci.c:2651:19: warning: unused variable 'sport' [-Wunused-variable] 2651 | struct sci_port *sport = to_sci_port(port); | ^~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc10 # Build took: 0:00:21.125065