# git rev-parse -q --verify 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861^{commit} # git fetch -q -n -f git://fs.ozlabs.ibm.com/kernel/linus master # git rev-parse -q --verify 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861^{commit} 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861 # 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/sparc64-linux/bin/sparc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux-ld --version # < git log --format=%s --max-count=1 64c3dd0b98f586a5b7c8f5f4759ebb41cfd03861 # < make -s -j 160 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- allmodconfig # Added to kconfig CONFIG_64BIT=n # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_HAVE_FTRACE_MCOUNT_RECORD=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MODULE_SIG=n # < make -s -j 160 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- help # make -s -j 160 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- olddefconfig # make -s -j 160 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- :1517:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sparc/kernel/irq_32.c: In function 'sparc_floppy_request_irq': /kisskb/src/arch/sparc/kernel/irq_32.c:258:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 258 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/include/asm/traps.h:10, from /kisskb/src/arch/sparc/kernel/kernel.h:8, from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/irq_32.c:261:46: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 261 | (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/uapi/asm/traps.h:27:38: note: in definition of macro 'SPARC_BRANCH' 27 | (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) | ^~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:259:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 259 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:262:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 262 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:263:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 263 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:272:17: note: in expansion of macro 'INSTANTIATE' 272 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:143:24: note: while referencing 'trapbase_cpu1' 143 | extern struct tt_entry trapbase_cpu1; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:258:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 258 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/include/asm/traps.h:10, from /kisskb/src/arch/sparc/kernel/kernel.h:8, from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/irq_32.c:261:46: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 261 | (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/uapi/asm/traps.h:27:38: note: in definition of macro 'SPARC_BRANCH' 27 | (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) | ^~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:259:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 259 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:262:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 262 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:263:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 263 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:274:17: note: in expansion of macro 'INSTANTIATE' 274 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:144:24: note: while referencing 'trapbase_cpu2' 144 | extern struct tt_entry trapbase_cpu2; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:258:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 258 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_one = SPARC_RD_PSR_L0; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/include/asm/traps.h:10, from /kisskb/src/arch/sparc/kernel/kernel.h:8, from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/irq_32.c:261:46: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 261 | (unsigned long) &table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two);\ | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/arch/sparc/include/uapi/asm/traps.h:27:38: note: in definition of macro 'SPARC_BRANCH' 27 | (0x10800000 | (((dest_addr-inst_addr)>>2)&0x3fffff)) | ^~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:259:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 259 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_two = \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:262:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 262 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_three = SPARC_RD_WIM_L3; \ | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ /kisskb/src/arch/sparc/kernel/irq_32.c:263:14: error: array subscript [16, 79] is outside array bounds of 'struct tt_entry[1]' [-Werror=array-bounds] 263 | table[SP_TRAP_IRQ1+(cpu_irq-1)].inst_four = SPARC_NOP; | ^ /kisskb/src/arch/sparc/kernel/irq_32.c:276:17: note: in expansion of macro 'INSTANTIATE' 276 | INSTANTIATE(trap_table) | ^~~~~~~~~~~ In file included from /kisskb/src/arch/sparc/kernel/irq_32.c:25: /kisskb/src/arch/sparc/kernel/kernel.h:145:24: note: while referencing 'trapbase_cpu3' 145 | extern struct tt_entry trapbase_cpu3; | ^~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:250: arch/sparc/kernel/irq_32.o] Error 1 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sparc/kernel] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:500: arch/sparc] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1992: .] Error 2 make: *** [Makefile:231: __sub-make] Error 2 Command 'make -s -j 160 ARCH=sparc O=/kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/sparc64-linux/bin/sparc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_sparc-allmodconfig_sparc64-gcc11 # Build took: 0:09:49.320775