| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20241121111135.2125391-3-dongtai.guo@linux.dev> Date: Thu, 21 Nov 2024 19:11:32 +0800 From: George Guo <dongtai.guo@...ux.dev> To: jpoimboe@...nel.org, jikos@...nel.org, mbenes@...e.cz, pmladek@...e.com, joe.lawrence@...hat.com, shuah@...nel.org Cc: live-patching@...r.kernel.org, linux-kselftest@...r.kernel.org, linux-kernel@...r.kernel.org, George Guo <guodongtai@...inos.cn> Subject: [PATCH livepatch/master v1 3/6] selftests/livepatch: fix test-livepatch.sh execution error From: George Guo <guodongtai@...inos.cn> The script test-callbacks.sh fails with the following error: $ sudo ./test-livepatch.sh TEST: basic function patching ... not ok - expected + result % insmod test_modules/test_klp_livepatch.ko livepatch: enabling patch 'test_klp_livepatch' -livepatch: 'test_klp_livepatch': initializing patching transition -livepatch: 'test_klp_livepatch': starting patching transition -livepatch: 'test_klp_livepatch': completing patching transition -livepatch: 'test_klp_livepatch': patching complete +transition: 'test_klp_livepatch': initializing patching transition +transition: 'test_klp_livepatch': starting patching transition +transition: 'test_klp_livepatch': completing patching transition +transition: 'test_klp_livepatch': patching complete % echo 0 > /sys/kernel/livepatch/test_klp_livepatch/enabled -livepatch: 'test_klp_livepatch': initializing unpatching transition -livepatch: 'test_klp_livepatch': starting unpatching transition -livepatch: 'test_klp_livepatch': completing unpatching transition -livepatch: 'test_klp_livepatch': unpatching complete +transition: 'test_klp_livepatch': initializing unpatching transition +transition: 'test_klp_livepatch': starting unpatching transition +transition: 'test_klp_livepatch': completing unpatching transition +transition: 'test_klp_livepatch': unpatching complete % rmmod test_klp_livepatch ERROR: livepatch kselftest(s) failed The issue arises due to a mismatch in expected log output during livepatch transition. Specifically, the logs previously contained "livepatch:" but have now been updated to "transition:". This results in test failures when comparing the output with the expected values. This patch updates the expected test output to reflect the new log format. Signed-off-by: George Guo <guodongtai@...inos.cn> --- .../selftests/livepatch/test-livepatch.sh | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tools/testing/selftests/livepatch/test-livepatch.sh b/tools/testing/selftests/livepatch/test-livepatch.sh index bd13257bfdfe..1297a6bf2bdd 100755 --- a/tools/testing/selftests/livepatch/test-livepatch.sh +++ b/tools/testing/selftests/livepatch/test-livepatch.sh @@ -35,15 +35,15 @@ fi check_result "% insmod test_modules/$MOD_LIVEPATCH1.ko livepatch: enabling patch '$MOD_LIVEPATCH1' -livepatch: '$MOD_LIVEPATCH1': initializing patching transition -livepatch: '$MOD_LIVEPATCH1': starting patching transition -livepatch: '$MOD_LIVEPATCH1': completing patching transition -livepatch: '$MOD_LIVEPATCH1': patching complete +transition: '$MOD_LIVEPATCH1': initializing patching transition +transition: '$MOD_LIVEPATCH1': starting patching transition +transition: '$MOD_LIVEPATCH1': completing patching transition +transition: '$MOD_LIVEPATCH1': patching complete % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH1/enabled -livepatch: '$MOD_LIVEPATCH1': initializing unpatching transition -livepatch: '$MOD_LIVEPATCH1': starting unpatching transition -livepatch: '$MOD_LIVEPATCH1': completing unpatching transition -livepatch: '$MOD_LIVEPATCH1': unpatching complete +transition: '$MOD_LIVEPATCH1': initializing unpatching transition +transition: '$MOD_LIVEPATCH1': starting unpatching transition +transition: '$MOD_LIVEPATCH1': completing unpatching transition +transition: '$MOD_LIVEPATCH1': unpatching complete % rmmod $MOD_LIVEPATCH1" @@ -79,31 +79,31 @@ grep 'live patched' /proc/meminfo > /dev/kmsg check_result "% insmod test_modules/$MOD_LIVEPATCH1.ko livepatch: enabling patch '$MOD_LIVEPATCH1' -livepatch: '$MOD_LIVEPATCH1': initializing patching transition -livepatch: '$MOD_LIVEPATCH1': starting patching transition -livepatch: '$MOD_LIVEPATCH1': completing patching transition -livepatch: '$MOD_LIVEPATCH1': patching complete +transition: '$MOD_LIVEPATCH1': initializing patching transition +transition: '$MOD_LIVEPATCH1': starting patching transition +transition: '$MOD_LIVEPATCH1': completing patching transition +transition: '$MOD_LIVEPATCH1': patching complete $MOD_LIVEPATCH1: this has been live patched % insmod test_modules/$MOD_REPLACE.ko replace=0 livepatch: enabling patch '$MOD_REPLACE' -livepatch: '$MOD_REPLACE': initializing patching transition -livepatch: '$MOD_REPLACE': starting patching transition -livepatch: '$MOD_REPLACE': completing patching transition -livepatch: '$MOD_REPLACE': patching complete +transition: '$MOD_REPLACE': initializing patching transition +transition: '$MOD_REPLACE': starting patching transition +transition: '$MOD_REPLACE': completing patching transition +transition: '$MOD_REPLACE': patching complete $MOD_LIVEPATCH1: this has been live patched $MOD_REPLACE: this has been live patched % echo 0 > /sys/kernel/livepatch/$MOD_REPLACE/enabled -livepatch: '$MOD_REPLACE': initializing unpatching transition -livepatch: '$MOD_REPLACE': starting unpatching transition -livepatch: '$MOD_REPLACE': completing unpatching transition -livepatch: '$MOD_REPLACE': unpatching complete +transition: '$MOD_REPLACE': initializing unpatching transition +transition: '$MOD_REPLACE': starting unpatching transition +transition: '$MOD_REPLACE': completing unpatching transition +transition: '$MOD_REPLACE': unpatching complete % rmmod $MOD_REPLACE $MOD_LIVEPATCH1: this has been live patched % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH1/enabled -livepatch: '$MOD_LIVEPATCH1': initializing unpatching transition -livepatch: '$MOD_LIVEPATCH1': starting unpatching transition -livepatch: '$MOD_LIVEPATCH1': completing unpatching transition -livepatch: '$MOD_LIVEPATCH1': unpatching complete +transition: '$MOD_LIVEPATCH1': initializing unpatching transition +transition: '$MOD_LIVEPATCH1': starting unpatching transition +transition: '$MOD_LIVEPATCH1': completing unpatching transition +transition: '$MOD_LIVEPATCH1': unpatching complete % rmmod $MOD_LIVEPATCH1" @@ -158,41 +158,41 @@ grep 'live patched' /proc/meminfo > /dev/kmsg check_result "% insmod test_modules/$MOD_LIVEPATCH1.ko livepatch: enabling patch '$MOD_LIVEPATCH1' -livepatch: '$MOD_LIVEPATCH1': initializing patching transition -livepatch: '$MOD_LIVEPATCH1': starting patching transition -livepatch: '$MOD_LIVEPATCH1': completing patching transition -livepatch: '$MOD_LIVEPATCH1': patching complete +transition: '$MOD_LIVEPATCH1': initializing patching transition +transition: '$MOD_LIVEPATCH1': starting patching transition +transition: '$MOD_LIVEPATCH1': completing patching transition +transition: '$MOD_LIVEPATCH1': patching complete $MOD_LIVEPATCH1: this has been live patched % insmod test_modules/$MOD_LIVEPATCH2.ko livepatch: enabling patch '$MOD_LIVEPATCH2' -livepatch: '$MOD_LIVEPATCH2': initializing patching transition -livepatch: '$MOD_LIVEPATCH2': starting patching transition -livepatch: '$MOD_LIVEPATCH2': completing patching transition -livepatch: '$MOD_LIVEPATCH2': patching complete +transition: '$MOD_LIVEPATCH2': initializing patching transition +transition: '$MOD_LIVEPATCH2': starting patching transition +transition: '$MOD_LIVEPATCH2': completing patching transition +transition: '$MOD_LIVEPATCH2': patching complete % insmod test_modules/$MOD_LIVEPATCH3.ko livepatch: enabling patch '$MOD_LIVEPATCH3' -livepatch: '$MOD_LIVEPATCH3': initializing patching transition +transition: '$MOD_LIVEPATCH3': initializing patching transition $MOD_LIVEPATCH3: pre_patch_callback: vmlinux -livepatch: '$MOD_LIVEPATCH3': starting patching transition -livepatch: '$MOD_LIVEPATCH3': completing patching transition +transition: '$MOD_LIVEPATCH3': starting patching transition +transition: '$MOD_LIVEPATCH3': completing patching transition $MOD_LIVEPATCH3: post_patch_callback: vmlinux -livepatch: '$MOD_LIVEPATCH3': patching complete +transition: '$MOD_LIVEPATCH3': patching complete % insmod test_modules/$MOD_REPLACE.ko replace=1 livepatch: enabling patch '$MOD_REPLACE' -livepatch: '$MOD_REPLACE': initializing patching transition -livepatch: '$MOD_REPLACE': starting patching transition -livepatch: '$MOD_REPLACE': completing patching transition -livepatch: '$MOD_REPLACE': patching complete +transition: '$MOD_REPLACE': initializing patching transition +transition: '$MOD_REPLACE': starting patching transition +transition: '$MOD_REPLACE': completing patching transition +transition: '$MOD_REPLACE': patching complete $MOD_REPLACE: this has been live patched % rmmod $MOD_LIVEPATCH3 % rmmod $MOD_LIVEPATCH2 % rmmod $MOD_LIVEPATCH1 $MOD_REPLACE: this has been live patched % echo 0 > /sys/kernel/livepatch/$MOD_REPLACE/enabled -livepatch: '$MOD_REPLACE': initializing unpatching transition -livepatch: '$MOD_REPLACE': starting unpatching transition -livepatch: '$MOD_REPLACE': completing unpatching transition -livepatch: '$MOD_REPLACE': unpatching complete +transition: '$MOD_REPLACE': initializing unpatching transition +transition: '$MOD_REPLACE': starting unpatching transition +transition: '$MOD_REPLACE': completing unpatching transition +transition: '$MOD_REPLACE': unpatching complete % rmmod $MOD_REPLACE" -- 2.39.2
Powered by blists - more mailing lists