# git rev-parse -q --verify d717180e7f9775d468f415c10a4a474640146001^{commit} d717180e7f9775d468f415c10a4a474640146001 already have revision, skipping fetch # git checkout -q -f -B kisskb d717180e7f9775d468f415c10a4a474640146001 # git clean -qxdf # < git log -1 # commit d717180e7f9775d468f415c10a4a474640146001 # Merge: 0b7da15c21c2 0c9782e204d3 # Author: Linus Torvalds # Date: Sun Jun 5 11:00:43 2022 -0700 # # Merge tag 'x86-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull x86 SGX fix from Thomas Gleixner: # "A single fix for x86/SGX to prevent that memory which is allocated for # an SGX enclave is accounted to the wrong memory control group" # # * tag 'x86-urgent-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # x86/sgx: Set active memcg prior to shmem allocation # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux-ld --version # < git log --format=%s --max-count=1 d717180e7f9775d468f415c10a4a474640146001 # < make -s -j 120 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux- randconfig # Added to kconfig CONFIG_PREVENT_FIRMWARE_BUILD=y # < make -s -j 120 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux- help # make -s -j 120 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux- olddefconfig .config:8655:warning: override: reassigning to symbol PREVENT_FIRMWARE_BUILD # make -s -j 120 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux- /kisskb/src/lib/test_kasan.c: In function 'krealloc_less_oob_helper.constprop': /kisskb/src/lib/test_kasan.c:330:59: error: array subscript 201 is outside array bounds of 'char[201]' [-Werror=array-bounds] 330 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2] = 'x'); | ~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:334:59: error: array subscript 208 is outside array bounds of 'char[201]' [-Werror=array-bounds] 334 | ptr2[round_up(size2, KASAN_GRANULE_SIZE)] = 'x'); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:344:52: error: array subscript 218 is outside array bounds of 'char[201]' [-Werror=array-bounds] 344 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[middle] = 'x'); | ~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:345:55: error: array subscript 234 is outside array bounds of 'char[201]' [-Werror=array-bounds] 345 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size1 - 1] = 'x'); | ~~~~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:346:51: error: array subscript 235 is outside array bounds of 'char[201]' [-Werror=array-bounds] 346 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size1] = 'x'); | ~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:322:16: note: referencing an object of size 201 allocated by 'krealloc' 322 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c: In function 'krealloc_more_oob_helper.constprop': /kisskb/src/lib/test_kasan.c:301:59: error: array subscript 235 is outside array bounds of 'char[235]' [-Werror=array-bounds] 301 | KUNIT_EXPECT_KASAN_FAIL(test, ptr2[size2] = 'x'); | ~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:290:16: note: referencing an object of size 235 allocated by 'krealloc' 290 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/lib/test_kasan.c:305:59: error: array subscript 240 is outside array bounds of 'char[235]' [-Werror=array-bounds] 305 | ptr2[round_up(size2, KASAN_GRANULE_SIZE)] = 'x'); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ /kisskb/src/lib/test_kasan.c:97:9: note: in definition of macro 'KUNIT_EXPECT_KASAN_FAIL' 97 | expression; \ | ^~~~~~~~~~ /kisskb/src/lib/test_kasan.c:290:16: note: referencing an object of size 235 allocated by 'krealloc' 290 | ptr2 = krealloc(ptr1, size2, GFP_KERNEL); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[2]: *** [/kisskb/src/scripts/Makefile.build:249: lib/test_kasan.o] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/kisskb/src/Makefile:1839: lib] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:219: __sub-make] Error 2 Command 'make -s -j 120 ARCH=arm64 O=/kisskb/build/linus-rand_arm64-randconfig_arm64-gcc11 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-11.1.0-nolibc/aarch64-linux/bin/aarch64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus-rand_arm64-randconfig_arm64-gcc11 # Build took: 0:02:25.589971