# git rev-parse -q --verify 573ae4f13f630d6660008f1974c0a8a29c30e18a^{commit} 573ae4f13f630d6660008f1974c0a8a29c30e18a already have revision, skipping fetch # git checkout -q -f -B kisskb 573ae4f13f630d6660008f1974c0a8a29c30e18a # git clean -qxdf # < git log -1 # commit 573ae4f13f630d6660008f1974c0a8a29c30e18a # Author: Jens Wiklander # Date: Thu Aug 18 13:08:59 2022 +0200 # # tee: add overflow check in register_shm_helper() # # With special lengths supplied by user space, register_shm_helper() has # an integer overflow when calculating the number of pages covered by a # supplied user space memory region. # # This causes internal_get_user_pages_fast() a helper function of # pin_user_pages_fast() to do a NULL pointer dereference: # # Unable to handle kernel NULL pointer dereference at virtual address 0000000000000010 # Modules linked in: # CPU: 1 PID: 173 Comm: optee_example_a Not tainted 5.19.0 #11 # Hardware name: QEMU QEMU Virtual Machine, BIOS 0.0.0 02/06/2015 # pc : internal_get_user_pages_fast+0x474/0xa80 # Call trace: # internal_get_user_pages_fast+0x474/0xa80 # pin_user_pages_fast+0x24/0x4c # register_shm_helper+0x194/0x330 # tee_shm_register_user_buf+0x78/0x120 # tee_ioctl+0xd0/0x11a0 # __arm64_sys_ioctl+0xa8/0xec # invoke_syscall+0x48/0x114 # # Fix this by adding an an explicit call to access_ok() in # tee_shm_register_user_buf() to catch an invalid user space address # early. # # Fixes: 033ddf12bcf5 ("tee: add register user memory") # Cc: stable@vger.kernel.org # Reported-by: Nimish Mishra # Reported-by: Anirban Chakraborty # Reported-by: Debdeep Mukhopadhyay # Suggested-by: Jerome Forissier # Signed-off-by: Jens Wiklander # Signed-off-by: Linus Torvalds # < /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 573ae4f13f630d6660008f1974c0a8a29c30e18a # < make -s -j 120 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 120 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 120 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 120 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[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sparc/kernel/irq_32.o] Error 1 make[3]: *** Waiting for unfinished jobs.... /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_page_for_dma': /kisskb/src/arch/sparc/mm/srmmu.c:1639:13: error: cast between incompatible function types from 'void (*)(long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1639 | xc1((smpfunc_t) local_ops->page_for_dma, page); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_cache_mm': /kisskb/src/arch/sparc/mm/srmmu.c:1662:29: error: cast between incompatible function types from 'void (*)(struct mm_struct *)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1662 | xc1((smpfunc_t) local_ops->cache_mm, (unsigned long) mm); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_tlb_mm': /kisskb/src/arch/sparc/mm/srmmu.c:1674:29: error: cast between incompatible function types from 'void (*)(struct mm_struct *)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1674 | xc1((smpfunc_t) local_ops->tlb_mm, (unsigned long) mm); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_cache_range': /kisskb/src/arch/sparc/mm/srmmu.c:1694:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1694 | xc3((smpfunc_t) local_ops->cache_range, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_tlb_range': /kisskb/src/arch/sparc/mm/srmmu.c:1711:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1711 | xc3((smpfunc_t) local_ops->tlb_range, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_cache_page': /kisskb/src/arch/sparc/mm/srmmu.c:1726:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1726 | xc2((smpfunc_t) local_ops->cache_page, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_tlb_page': /kisskb/src/arch/sparc/mm/srmmu.c:1741:29: error: cast between incompatible function types from 'void (*)(struct vm_area_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1741 | xc2((smpfunc_t) local_ops->tlb_page, | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_page_to_ram': /kisskb/src/arch/sparc/mm/srmmu.c:1756:13: error: cast between incompatible function types from 'void (*)(long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1756 | xc1((smpfunc_t) local_ops->page_to_ram, page); | ^ /kisskb/src/arch/sparc/mm/srmmu.c: In function 'smp_flush_sig_insns': /kisskb/src/arch/sparc/mm/srmmu.c:1767:21: error: cast between incompatible function types from 'void (*)(struct mm_struct *, long unsigned int)' to 'void (*)(long unsigned int, long unsigned int, long unsigned int, long unsigned int, long unsigned int)' [-Werror=cast-function-type] 1767 | xc2((smpfunc_t) local_ops->sig_insns, | ^ cc1: all warnings being treated as errors make[3]: *** [/kisskb/src/scripts/Makefile.build:249: arch/sparc/mm/srmmu.o] Error 1 make[2]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sparc/mm] Error 2 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:465: arch/sparc/kernel] Error 2 make[1]: *** [/kisskb/src/Makefile:1855: arch/sparc] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:222: __sub-make] Error 2 Command 'make -s -j 120 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:04:51.459733