# git rev-parse -q --verify 874c8ca1e60b2c564a48f7e7acc40d328d5c8733^{commit} 874c8ca1e60b2c564a48f7e7acc40d328d5c8733 already have revision, skipping fetch # git checkout -q -f -B kisskb 874c8ca1e60b2c564a48f7e7acc40d328d5c8733 # git clean -qxdf # < git log -1 # commit 874c8ca1e60b2c564a48f7e7acc40d328d5c8733 # Author: David Howells # Date: Thu Jun 9 21:46:04 2022 +0100 # # netfs: Fix gcc-12 warning by embedding vfs inode in netfs_i_context # # While randstruct was satisfied with using an open-coded "void *" offset # cast for the netfs_i_context <-> inode casting, __builtin_object_size() as # used by FORTIFY_SOURCE was not as easily fooled. This was causing the # following complaint[1] from gcc v12: # # In file included from include/linux/string.h:253, # from include/linux/ceph/ceph_debug.h:7, # from fs/ceph/inode.c:2: # In function 'fortify_memset_chk', # inlined from 'netfs_i_context_init' at include/linux/netfs.h:326:2, # inlined from 'ceph_alloc_inode' at fs/ceph/inode.c:463:2: # include/linux/fortify-string.h:242:25: warning: call to '__write_overflow_field' declared with attribute warning: detected write beyond size of field (1st parameter); maybe use struct_group()? [-Wattribute-warning] # 242 | __write_overflow_field(p_size_field, size); # | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # # Fix this by embedding a struct inode into struct netfs_i_context (which # should perhaps be renamed to struct netfs_inode). The struct inode # vfs_inode fields are then removed from the 9p, afs, ceph and cifs inode # structs and vfs_inode is then simply changed to "netfs.inode" in those # filesystems. # # Further, rename netfs_i_context to netfs_inode, get rid of the # netfs_inode() function that converted a netfs_i_context pointer to an # inode pointer (that can now be done with &ctx->inode) and rename the # netfs_i_context() function to netfs_inode() (which is now a wrapper # around container_of()). # # Most of the changes were done with: # # perl -p -i -e 's/vfs_inode/netfs.inode/'g \ # `git grep -l 'vfs_inode' -- fs/{9p,afs,ceph,cifs}/*.[ch]` # # Kees suggested doing it with a pair structure[2] and a special # declarator to insert that into the network filesystem's inode # wrapper[3], but I think it's cleaner to embed it - and then it doesn't # matter if struct randomisation reorders things. # # Dave Chinner suggested using a filesystem-specific VFS_I() function in # each filesystem to convert that filesystem's own inode wrapper struct # into the VFS inode struct[4]. # # Version #2: # - Fix a couple of missed name changes due to a disabled cifs option. # - Rename nfs_i_context to nfs_inode # - Use "netfs" instead of "nic" as the member name in per-fs inode wrapper # structs. # # [ This also undoes commit 507160f46c55 ("netfs: gcc-12: temporarily # disable '-Wattribute-warning' for now") that is no longer needed ] # # Fixes: bc899ee1c898 ("netfs: Add a netfs inode context") # Reported-by: Jeff Layton # Signed-off-by: David Howells # Reviewed-by: Jeff Layton # Reviewed-by: Kees Cook # Reviewed-by: Xiubo Li # cc: Jonathan Corbet # cc: Eric Van Hensbergen # cc: Latchesar Ionkov # cc: Dominique Martinet # cc: Christian Schoenebeck # cc: Marc Dionne # cc: Ilya Dryomov # cc: Steve French # cc: William Kucharski # cc: "Matthew Wilcox (Oracle)" # cc: Dave Chinner # cc: linux-doc@vger.kernel.org # cc: v9fs-developer@lists.sourceforge.net # cc: linux-afs@lists.infradead.org # cc: ceph-devel@vger.kernel.org # cc: linux-cifs@vger.kernel.org # cc: samba-technical@lists.samba.org # cc: linux-fsdevel@vger.kernel.org # cc: linux-hardening@vger.kernel.org # Link: https://lore.kernel.org/r/d2ad3a3d7bdd794c6efb562d2f2b655fb67756b9.camel@kernel.org/ [1] # Link: https://lore.kernel.org/r/20220517210230.864239-1-keescook@chromium.org/ [2] # Link: https://lore.kernel.org/r/20220518202212.2322058-1-keescook@chromium.org/ [3] # Link: https://lore.kernel.org/r/20220524101205.GI2306852@dread.disaster.area/ [4] # Link: https://lore.kernel.org/r/165296786831.3591209.12111293034669289733.stgit@warthog.procyon.org.uk/ # v1 # Link: https://lore.kernel.org/r/165305805651.4094995.7763502506786714216.stgit@warthog.procyon.org.uk # v2 # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 874c8ca1e60b2c564a48f7e7acc40d328d5c8733 # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- se7619_defconfig # < make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 32 ARCH=sh O=/kisskb/build/linus_se7619_defconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/machvec.c: In function 'sh_mv_setup': /kisskb/src/arch/sh/kernel/machvec.c:105:33: warning: array subscript 'struct sh_machine_vector[0]' is partly outside array bounds of 'long int[1]' [-Warray-bounds] 105 | sh_mv = *(struct sh_machine_vector *)&__machvec_start; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/kernel/machvec.c:13: /kisskb/src/arch/sh/include/asm/sections.h:7:13: note: while referencing '__machvec_start' 7 | extern long __machvec_start, __machvec_end; | ^~~~~~~~~~~~~~~ In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:594, 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:31: note: in expansion of macro '_INTC_ARRAY' 105 | _INTC_ARRAY(vectors), _INTC_ARRAY(groups), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: 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:9: note: in expansion of macro '_INTC_ARRAY' 106 | _INTC_ARRAY(mask_regs), _INTC_ARRAY(prio_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: 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:9: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: 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:34: note: in expansion of macro '_INTC_ARRAY' 107 | _INTC_ARRAY(sense_regs), _INTC_ARRAY(ack_regs), \ | ^~~~~~~~~~~ /kisskb/src/include/linux/sh_intc.h:124:15: 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:2655:26: warning: unused variable 'sport' [-Wunused-variable] 2655 | struct sci_port *sport = to_sci_port(port); | ^~~~~ Completed OK # rm -rf /kisskb/build/linus_se7619_defconfig_sh4-gcc11 # Build took: 0:00:17.827829