# git rev-parse -q --verify ae3419fbac845b4d3f3a9fae4cc80c68d82cdf6e^{commit} ae3419fbac845b4d3f3a9fae4cc80c68d82cdf6e already have revision, skipping fetch # git checkout -q -f -B kisskb ae3419fbac845b4d3f3a9fae4cc80c68d82cdf6e # git clean -qxdf # < git log -1 # commit ae3419fbac845b4d3f3a9fae4cc80c68d82cdf6e # Author: Thomas Weißschuh # Date: Mon Feb 20 06:46:12 2023 +0000 # # vc_screen: don't clobber return value in vcs_read # # Commit 226fae124b2d ("vc_screen: move load of struct vc_data pointer in # vcs_read() to avoid UAF") moved the call to vcs_vc() into the loop. # # While doing this it also moved the unconditional assignment of # # ret = -ENXIO; # # This unconditional assignment was valid outside the loop but within it # it clobbers the actual value of ret. # # To avoid this only assign "ret = -ENXIO" when actually needed. # # [ Also, the 'goto unlock_out" needs to be just a "break", so that it # does the right thing when it exits on later iterations when partial # success has happened - Linus ] # # Reported-by: Storm Dragon # Link: https://lore.kernel.org/lkml/Y%2FKS6vdql2pIsCiI@hotmail.com/ # Fixes: 226fae124b2d ("vc_screen: move load of struct vc_data pointer in vcs_read() to avoid UAF") # Signed-off-by: Thomas Weißschuh # Link: https://lore.kernel.org/lkml/64981d94-d00c-4b31-9063-43ad0a384bde@t-8ch.de/ # Signed-off-by: Linus Torvalds # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux-ld --version # < git log --format=%s --max-count=1 ae3419fbac845b4d3f3a9fae4cc80c68d82cdf6e # < make -s -j 160 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig # < make -s -j 160 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux- help # make -s -j 160 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux- olddefconfig .config:14307:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 160 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux- In file included from /kisskb/src/arch/mips/include/asm/div64.h:89, from /kisskb/src/include/linux/math.h:6, from /kisskb/src/include/linux/math64.h:6, from /kisskb/src/include/linux/time64.h:5, from /kisskb/src/include/linux/restart_block.h:10, from /kisskb/src/include/linux/thread_info.h:14, from /kisskb/src/include/asm-generic/current.h:5, from ./arch/mips/include/generated/asm/current.h:1, from /kisskb/src/include/linux/sched.h:12, from /kisskb/src/include/linux/ratelimit.h:6, from /kisskb/src/include/linux/dev_printk.h:16, from /kisskb/src/include/linux/device.h:15, from /kisskb/src/include/linux/auxiliary_bus.h:11, from /kisskb/src/drivers/power/supply/qcom_battmgr.c:6: /kisskb/src/drivers/power/supply/qcom_battmgr.c: In function 'qcom_battmgr_sm8350_callback': /kisskb/src/include/asm-generic/div64.h:222:35: error: comparison of distinct pointer types lacks a cast [-Werror] 222 | (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \ | ^~ /kisskb/src/drivers/power/supply/qcom_battmgr.c:1130:25: note: in expansion of macro 'do_div' 1130 | do_div(battmgr->status.percent, 100); | ^~~~~~ In file included from /kisskb/src/include/linux/dev_printk.h:14, from /kisskb/src/include/linux/device.h:15, from /kisskb/src/include/linux/auxiliary_bus.h:11, from /kisskb/src/drivers/power/supply/qcom_battmgr.c:6: /kisskb/src/include/asm-generic/div64.h:234:32: error: right shift count >= width of type [-Werror=shift-count-overflow] 234 | } else if (likely(((n) >> 32) == 0)) { \ | ^~ /kisskb/src/include/linux/compiler.h:77:45: note: in definition of macro 'likely' 77 | # define likely(x) __builtin_expect(!!(x), 1) | ^ /kisskb/src/drivers/power/supply/qcom_battmgr.c:1130:25: note: in expansion of macro 'do_div' 1130 | do_div(battmgr->status.percent, 100); | ^~~~~~ cc1: all warnings being treated as errors make[5]: *** [/kisskb/src/scripts/Makefile.build:252: drivers/power/supply/qcom_battmgr.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/power/supply] Error 2 make[3]: *** [/kisskb/src/scripts/Makefile.build:494: drivers/power] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:494: drivers] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:2028: .] Error 2 make: *** [Makefile:226: __sub-make] Error 2 Command 'make -s -j 160 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mips-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.3.0-nolibc/mips-linux/bin/mips-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mips-gcc11 # Build took: 0:06:52.858077