# git rev-parse -q --verify d41a3effbb53b1bcea41e328d16a4d046a508381^{commit} d41a3effbb53b1bcea41e328d16a4d046a508381 already have revision, skipping fetch # git checkout -q -f -B kisskb d41a3effbb53b1bcea41e328d16a4d046a508381 # git clean -qxdf # < git log -1 # commit d41a3effbb53b1bcea41e328d16a4d046a508381 # Author: Hillf Danton # Date: Mon Sep 2 13:37:29 2019 +0100 # # keys: Fix missing null pointer check in request_key_auth_describe() # # If a request_key authentication token key gets revoked, there's a window in # which request_key_auth_describe() can see it with a NULL payload - but it # makes no check for this and something like the following oops may occur: # # BUG: Kernel NULL pointer dereference at 0x00000038 # Faulting instruction address: 0xc0000000004ddf30 # Oops: Kernel access of bad area, sig: 11 [#1] # ... # NIP [...] request_key_auth_describe+0x90/0xd0 # LR [...] request_key_auth_describe+0x54/0xd0 # Call Trace: # [...] request_key_auth_describe+0x54/0xd0 (unreliable) # [...] proc_keys_show+0x308/0x4c0 # [...] seq_read+0x3d0/0x540 # [...] proc_reg_read+0x90/0x110 # [...] __vfs_read+0x3c/0x70 # [...] vfs_read+0xb4/0x1b0 # [...] ksys_read+0x7c/0x130 # [...] system_call+0x5c/0x70 # # Fix this by checking for a NULL pointer when describing such a key. # # Also make the read routine check for a NULL pointer to be on the safe side. # # [DH: Modified to not take already-held rcu lock and modified to also check # in the read routine] # # Fixes: 04c567d9313e ("[PATCH] Keys: Fix race between two instantiators of a key") # Reported-by: Sachin Sant # Signed-off-by: Hillf Danton # Signed-off-by: David Howells # Tested-by: Sachin Sant # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-gcc --version # < /opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux-ld --version # < git log --format=%s --max-count=1 d41a3effbb53b1bcea41e328d16a4d046a508381 # < make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- sh7724_generic_defconfig # make -s -j 24 ARCH=sh O=/kisskb/build/linus_sh7724_generic_defconfig_sh4 CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/sh4-linux/bin/sh4-linux- Generating include/generated/machtypes.h :1511:2: warning: #warning syscall clone3 not implemented [-Wcpp] /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S: Assembler messages: /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:385: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/arch/sh/kernel/cpu/sh4/../sh3/../../entry-common.S:388: Warning: overflow in branch to syscall_exit_work; converted into longer instruction sequence /kisskb/src/fs/proc/inode.c: In function 'proc_reg_open': /kisskb/src/include/linux/list.h:65:12: warning: 'pdeo' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/fs/proc/inode.c:338:21: note: 'pdeo' was declared here /kisskb/src/kernel/printk/printk.c: In function 'devkmsg_sysctl_set_loglvl': /kisskb/src/kernel/printk/printk.c:194:16: warning: 'old' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function '_regmap_raw_write': /kisskb/src/drivers/base/regmap/regmap.c:1852:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/base/regmap/regmap.c: In function 'regmap_raw_read': /kisskb/src/drivers/base/regmap/regmap.c:2591:6: warning: 'ret' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c: In function 'sh_mobile_i2c_isr': /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:399:26: warning: 'data' may be used uninitialized in this function [-Wuninitialized] /kisskb/src/drivers/i2c/busses/i2c-sh_mobile.c:372:16: note: 'data' was declared here /kisskb/src/drivers/sh/clk/cpg.c: In function 'r8': /kisskb/src/drivers/sh/clk/cpg.c:41:2: warning: passing argument 1 of 'ioread8' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:29:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r16': /kisskb/src/drivers/sh/clk/cpg.c:46:2: warning: passing argument 1 of 'ioread16' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:30:21: note: expected 'void *' but argument is of type 'const void *' /kisskb/src/drivers/sh/clk/cpg.c: In function 'r32': /kisskb/src/drivers/sh/clk/cpg.c:51:2: warning: passing argument 1 of 'ioread32' discards 'const' qualifier from pointer target type [enabled by default] /kisskb/src/include/asm-generic/iomap.h:32:21: note: expected 'void *' but argument is of type 'const void *' Kernel: arch/sh/boot/zImage is ready Completed OK # rm -rf /kisskb/build/linus_sh7724_generic_defconfig_sh4 # Build took: 0:00:27.616982