# git rev-parse -q --verify aee101d7b95a03078945681dd7f7ea5e4a1e7686^{commit} aee101d7b95a03078945681dd7f7ea5e4a1e7686 already have revision, skipping fetch # git checkout -q -f -B kisskb aee101d7b95a03078945681dd7f7ea5e4a1e7686 # git clean -qxdf # < git log -1 # commit aee101d7b95a03078945681dd7f7ea5e4a1e7686 # Author: Nicholas Piggin # Date: Mon Jan 17 23:44:03 2022 +1000 # # powerpc/64s: Mask SRR0 before checking against the masked NIP # # Commit 314f6c23dd8d ("powerpc/64s: Mask NIP before checking against # SRR0") masked off the low 2 bits of the NIP value in the interrupt # stack frame in case they are non-zero and mis-compare against a SRR0 # register value of a CPU which always reads back 0 from the 2 low bits # which are reserved. # # This now causes the opposite problem that an implementation which does # implement those bits in SRR0 will mis-compare against the masked NIP # value in which they have been cleared. QEMU is one such implementation, # and this is allowed by the architecture. # # This can be triggered by sigfuz by setting low bits of PT_NIP in the # signal context. # # Fix this for now by masking the SRR0 bits as well. Cleaner is probably # to sanitise these values before putting them in registers or stack, but # this is the quick and backportable fix. # # Fixes: 314f6c23dd8d ("powerpc/64s: Mask NIP before checking against SRR0") # Signed-off-by: Nicholas Piggin # Signed-off-by: Michael Ellerman # Link: https://lore.kernel.org/r/20220117134403.2995059-1-npiggin@gmail.com # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 aee101d7b95a03078945681dd7f7ea5e4a1e7686 # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pmac32_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- pmac32_defconfig # < make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pmac32_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pmac32_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pmac32_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- /kisskb/src/drivers/net/ethernet/apple/mace.c: In function 'mace_probe': /kisskb/src/drivers/net/ethernet/apple/mace.c:170:20: error: assignment of read-only location '*(dev->dev_addr + (sizetype)((unsigned int)j * 1u))' dev->dev_addr[j] = rev ? bitrev8(addr[j]): addr[j]; ^ /kisskb/src/drivers/net/ethernet/apple/mace.c: In function 'mace_reset': /kisskb/src/drivers/net/ethernet/apple/mace.c:349:29: warning: passing argument 2 of '__mace_set_address' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers] __mace_set_address(dev, dev->dev_addr); ^ /kisskb/src/drivers/net/ethernet/apple/mace.c:93:13: note: expected 'void *' but argument is of type 'const unsigned char *' static void __mace_set_address(struct net_device *dev, void *addr); ^ /kisskb/src/drivers/net/ethernet/apple/mace.c: In function '__mace_set_address': /kisskb/src/drivers/net/ethernet/apple/mace.c:388:36: error: assignment of read-only location '*(dev->dev_addr + (sizetype)((unsigned int)i * 1u))' out_8(&mb->padr, dev->dev_addr[i] = p[i]); ^ make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/net/ethernet/apple/mace.o] Error 1 make[5]: *** Waiting for unfinished jobs.... /kisskb/src/drivers/net/ethernet/apple/bmac.c: In function 'bmac_probe': /kisskb/src/drivers/net/ethernet/apple/bmac.c:1287:20: error: assignment of read-only location '*(dev->dev_addr + (sizetype)((unsigned int)j * 1u))' dev->dev_addr[j] = rev ? bitrev8(addr[j]): addr[j]; ^ make[5]: *** [/kisskb/src/scripts/Makefile.build:288: drivers/net/ethernet/apple/bmac.o] Error 1 make[4]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/net/ethernet/apple] Error 2 make[4]: *** Waiting for unfinished jobs.... make[3]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/net/ethernet] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/scripts/Makefile.build:550: drivers/net] Error 2 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1840: drivers] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 32 ARCH=powerpc O=/kisskb/build/powerpc-fixes_pmac32_defconfig_powerpc-gcc5 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-5.5.0-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/powerpc-fixes_pmac32_defconfig_powerpc-gcc5 # Build took: 0:00:56.830919