# 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/hppa-linux/bin/hppa-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/hppa-linux/bin/hppa-linux-ld --version # < git log --format=%s --max-count=1 573ae4f13f630d6660008f1974c0a8a29c30e18a # < make -s -j 48 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/hppa-linux/bin/hppa-linux- generic-32bit_defconfig # < make -s -j 48 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/hppa-linux/bin/hppa-linux- help # make -s -j 48 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/hppa-linux/bin/hppa-linux- olddefconfig # make -s -j 48 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/hppa-linux/bin/hppa-linux- /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S: Assembler messages: /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S:16: Error: bad or irreducible absolute expression /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S:16: Error: junk at end of line, first unrecognized character is `:' /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S:26: Error: no such instruction: `ldw 0(%sp),%r31' /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S:29: Error: no such instruction: `be 0x100(%sr2,%r0)' /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S:30: Error: no such instruction: `ldi 0,%r20' /kisskb/src/arch/parisc/kernel/vdso32/restart_syscall.S:32: Error: .cfi_endproc without corresponding .cfi_startproc /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S: Assembler messages: /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:39: Error: unknown pseudo-op: `.proc' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:40: Error: unknown pseudo-op: `.callinfo' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:41: Error: unknown pseudo-op: `.entry' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:44: Error: no such instruction: `ldi 0,%r25' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:45: Error: no such instruction: `ldi 173,%r20' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:46: Error: no such instruction: `ble 0x100(%sr2,%r0)' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:49: Error: no such instruction: `ldi 1,%r25' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:50: Error: no such instruction: `ldi 173,%r20' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:51: Error: no such instruction: `ble 0x100(%sr2,%r0)' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:54: Error: unknown pseudo-op: `.exit' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:55: Error: unknown pseudo-op: `.procend' /kisskb/src/arch/parisc/kernel/vdso32/sigtramp.S:76: Error: unknown pseudo-op: `.stringz' make[2]: *** [/kisskb/src/arch/parisc/kernel/vdso32/Makefile:34: arch/parisc/kernel/vdso32/restart_syscall.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/arch/parisc/kernel/vdso32/Makefile:34: arch/parisc/kernel/vdso32/sigtramp.o] Error 1 make[1]: *** [/kisskb/src/arch/parisc/Makefile:176: vdso_prepare] Error 2 make: *** [Makefile:222: __sub-make] Error 2 Command 'make -s -j 48 ARCH=parisc O=/kisskb/build/linus_generic-32bit_defconfig_parisc-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/hppa-linux/bin/hppa-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_generic-32bit_defconfig_parisc-gcc11 # Build took: 0:00:05.287013