# 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/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 573ae4f13f630d6660008f1974c0a8a29c30e18a # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/include/linux/string.h:20, from /kisskb/src/include/linux/bitmap.h:11, from /kisskb/src/include/linux/cpumask.h:12, from /kisskb/src/include/linux/mm_types_task.h:14, from /kisskb/src/include/linux/mm_types.h:5, from /kisskb/src/include/linux/buildid.h:5, from /kisskb/src/include/linux/module.h:14, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:32: In function 'check586', inlined from 'sun3_82586_probe1' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:365:6, inlined from 'sun3_82586_probe' at /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:311:8: /kisskb/src/arch/m68k/include/asm/string.h:68:25: warning: '__builtin_memset' offset [0, 11] is out of the bounds [0, 0] [-Warray-bounds] 68 | #define memset(d, c, n) __builtin_memset(d, c, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:218:9: note: in expansion of macro 'memset' 218 | memset((char *)p->scp,0, sizeof(struct scp_struct)); | ^~~~~~ In file included from /kisskb/src/include/linux/swab.h:5, from /kisskb/src/include/uapi/linux/byteorder/big_endian.h:14, from /kisskb/src/include/linux/byteorder/big_endian.h:5, from /kisskb/src/arch/m68k/include/uapi/asm/byteorder.h:5, from /kisskb/src/include/asm-generic/bitops/le.h:6, from /kisskb/src/arch/m68k/include/asm/bitops.h:548, from /kisskb/src/include/linux/bitops.h:67, from /kisskb/src/include/linux/kernel.h:22, from /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:31: /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c: In function 'sun3_82586_timeout': /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:122: warning: array subscript 1 is above array bounds of 'volatile struct transmit_cmd_struct *[1]' [-Warray-bounds] 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ~~~~~~~~~~~~^~~ /kisskb/src/include/uapi/linux/swab.h:107:19: note: in definition of macro '__swab16' 107 | __fswab16(x)) | ^ /kisskb/src/include/linux/printk.h:464:26: note: in expansion of macro 'printk_index_wrap' 464 | #define printk(fmt, ...) printk_index_wrap(_printk, fmt, ##__VA_ARGS__) | ^~~~~~~~~~~~~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:989:17: note: in expansion of macro 'printk' 989 | printk("%s: command-stats: %04x %04x\n",dev->name,swab16(p->xmit_cmds[0]->cmd_status),swab16(p->xmit_cmds[1]->cmd_status)); | ^~~~~~ /kisskb/src/drivers/net/ethernet/i825xx/sun3_82586.c:155:46: note: while referencing 'xmit_cmds' 155 | volatile struct transmit_cmd_struct *xmit_cmds[NUM_XMIT_BUFFS]; | ^~~~~~~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc11 # Build took: 0:02:48.833368