# git rev-parse -q --verify 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861^{commit} 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861 already have revision, skipping fetch # git checkout -q -f -B kisskb 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861 # git clean -qxdf # < git log -1 # commit 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861 # Merge: 5d8401be15a9 4eb559dd1567 # Author: Linus Torvalds # Date: Fri Nov 4 15:05:42 2022 -0700 # # Merge tag 'xfs-6.1-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux # # Pull xfs fixes from Darrick Wong: # "Dave and I had thought that this would be a very quiet cycle, but we # thought wrong. # # At first there were the usual trickle of minor bugfixes, but then # Zorro pulled -rc1 and noticed complaints about the stronger memcpy # checks w.r.t. flex arrays. # # Analyzing how to fix that revealed a bunch of validation gaps in # validating ondisk log items during recovery, and then a customer hit # an infinite loop in the refcounting code on a corrupt filesystem. # # So. This largeish batch of fixes addresses all those problems, I hope. # # Summary: # # - Fix a UAF bug during log recovery # # - Fix memory leaks when mount fails # # - Detect corrupt bestfree information in a directory block # # - Fix incorrect return value type for the dax page fault handlers # # - Fix fortify complaints about memcpy of xfs log item objects # # - Strengthen inadequate validation of recovered log items # # - Fix incorrectly declared flex array in EFI log item structs # # - Log corrupt log items for debugging purposes # # - Fix infinite loop problems in the refcount code if the refcount # btree node block keys are corrupt # # - Fix infinite loop problems in the refcount code if the refcount # btree records suffer MSB bitflips # # - Add more sanity checking to continued defer ops to prevent # overflows from one AG to the next or off EOFS" # # * tag 'xfs-6.1-fixes-4' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: (28 commits) # xfs: rename XFS_REFC_COW_START to _COWFLAG # xfs: fix uninitialized list head in struct xfs_refcount_recovery # xfs: fix agblocks check in the cow leftover recovery function # xfs: check record domain when accessing refcount records # xfs: remove XFS_FIND_RCEXT_SHARED and _COW # xfs: refactor domain and refcount checking # xfs: report refcount domain in tracepoints # xfs: track cow/shared record domains explicitly in xfs_refcount_irec # xfs: refactor refcount record usage in xchk_refcountbt_rec # xfs: dump corrupt recovered log intent items to dmesg consistently # xfs: move _irec structs to xfs_types.h # xfs: actually abort log recovery on corrupt intent-done log items # xfs: check deferred refcount op continuation parameters # xfs: refactor all the EFI/EFD log item sizeof logic # xfs: create a predicate to verify per-AG extents # xfs: fix memcpy fortify errors in EFI log format copying # xfs: make sure aglen never goes negative in xfs_refcount_adjust_extents # xfs: fix memcpy fortify errors in RUI log format copying # xfs: fix memcpy fortify errors in CUI log format copying # xfs: fix memcpy fortify errors in BUI log format copying # ... # < /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 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861 # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # < make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- help # make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- olddefconfig # make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_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/cpu/sh2/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:85: Warning: overflow in branch to __restore_all; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:357: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh2/../../entry-common.S:360: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence In file included from /kisskb/src/arch/sh/include/asm/hw_irq.h:6, from /kisskb/src/include/linux/irq.h:596, 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: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-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: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-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: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-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: error: division 'sizeof (void *) / sizeof (void)' does not compute the number of array elements [-Werror=sizeof-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, | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[6]: *** [/kisskb/src/scripts/Makefile.build:250: arch/sh/kernel/cpu/sh2/setup-sh7619.o] Error 1 make[5]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh/kernel/cpu/sh2] Error 2 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh/kernel/cpu] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh/kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sh] Error 2 make[2]: *** Waiting for unfinished jobs.... {standard input}: Assembler messages: {standard input}: Warning: end of file not at end of a line; newline inserted {standard input}:2305: Error: unknown pseudo-op: `.l' {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive {standard input}:2213: Error: displacement to undefined symbol .L382 overflows 8-bit field {standard input}:2286: Error: displacement to undefined symbol .L377 overflows 12-bit field {standard input}:2302: Error: displacement to undefined symbol .L378 overflows 8-bit field {standard input}:2204: Error: pcrel too far {standard input}:2206: Error: pcrel too far {standard input}:2209: Error: pcrel too far {standard input}:2215: Error: pcrel too far {standard input}:2216: Error: pcrel too far {standard input}:2217: Error: pcrel too far {standard input}:2221: Error: pcrel too far {standard input}:2229: Error: pcrel too far {standard input}:2231: Error: pcrel too far {standard input}:2232: Error: pcrel too far {standard input}:2247: Error: pcrel too far {standard input}:2248: Error: pcrel too far {standard input}:2249: Error: pcrel too far {standard input}:2259: Error: pcrel too far {standard input}:2261: Error: pcrel too far {standard input}:2262: Error: pcrel too far {standard input}:2274: Error: pcrel too far {standard input}:2293: Error: pcrel too far sh4-linux-gcc: internal compiler error: Segmentation fault signal terminated program cc1 Please submit a full bug report, with preprocessed source if appropriate. See for instructions. make[5]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/net/pcs/pcs-xpcs.o] Error 4 make[5]: *** Waiting for unfinished jobs.... make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net/pcs] Error 2 make[4]: *** Waiting for unfinished jobs.... In file included from /kisskb/src/include/linux/io.h:13, from /kisskb/src/include/linux/irq.h:20, 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/highmem.h:12, from /kisskb/src/include/linux/bvec.h:10, from /kisskb/src/include/linux/skbuff.h:17, from /kisskb/src/include/net/net_namespace.h:43, from /kisskb/src/include/linux/netdevice.h:38, from /kisskb/src/drivers/staging/octeon/ethernet-mem.c:9: /kisskb/src/drivers/staging/octeon/ethernet-mem.c: In function 'cvm_oct_free_hw_memory': /kisskb/src/arch/sh/include/asm/io.h:239:34: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] 239 | #define phys_to_virt(address) ((void *)(address)) | ^ /kisskb/src/drivers/staging/octeon/ethernet-mem.c:123:39: note: in expansion of macro 'phys_to_virt' 123 | fpa = (char *)phys_to_virt(cvmx_ptr_to_phys(fpa)); | ^~~~~~~~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:250: drivers/staging/octeon/ethernet-mem.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/staging/octeon] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/staging] Error 2 make[3]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: drivers/net] Error 2 make[2]: *** [/kisskb/src/scripts/Makefile.build:500: drivers] Error 2 make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sh O=/kisskb/build/linus_sh-allmodconfig_sh4-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sh4-linux/bin/sh4-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sh-allmodconfig_sh4-gcc11 # Build took: 0:03:41.814975