selftests: livepatch: Fix it to do root uid check and skip
Subsystems (2)
Shuah Khan
maintainerPATCH v2 1/1 selftests: livepatch: Fix it to do root uid check and skip
livepatch test configures the system and debug environment to run tests. Some of these actions fail without root access and test dumps several permission denied messages before it exits.
Fix test-state.sh to call setup_config instead of set_dynamic_debug as suggested by Petr Mladek <[email protected]>
Fix it to check root uid and exit with skip code instead.
--- tools/testing/selftests/livepatch/functions.sh | 15 ++++++++++++++- tools/testing/selftests/livepatch/test-state.sh | 3 +-- 2 files changed, 15 insertions(+), 3 deletions(-)
tools/testing/selftests/livepatch/functions.sh +14 -1
@@ -7,6 +7,9 @@ MAX_RETRIES=600 RETRY_INTERVAL=".1" # seconds +# Kselftest framework requirement - SKIP code is 4 +ksft_skip=4 + # log(msg) - write message to kernel log # msg - insightful words function log() {
@@ -18,7 +21,16 @@ function log() { function skip() { log "SKIP: $1" echo "SKIP: $1" >&2 - exit 4 + exit $ksft_skip +} + +# root test +function is_root() { + uid=$(id -u) + if [ $uid -ne 0 ]; then + echo "skip all tests: must be run as root" >&2 + exit $ksft_skip + fi } # die(msg) - game over, man
@@ -62,6 +74,7 @@ function set_ftrace_enabled() { # for verbose livepatching output and turn on # the ftrace_enabled sysctl. function setup_config() { + is_root push_config set_dynamic_debug set_ftrace_enabled 1
tools/testing/selftests/livepatch/test-state.sh +1 -2
@@ -8,8 +8,7 @@ MOD_LIVEPATCH=test_klp_state MOD_LIVEPATCH2=test_klp_state2 MOD_LIVEPATCH3=test_klp_state3 -set_dynamic_debug - +setup_config # TEST: Loading and removing a module that modifies the system state
Signature · 1 line
2.20.1
Quoted 72 lines · Shuah Khan
livepatch test configures the system and debug environment to run tests. Some of these actions fail without root access and test dumps several permission denied messages before it exits.
Fix
test-state.shto callsetup_configinstead ofset_dynamic_debugas suggested by Petr Mladek <[email protected]>Fix it to check root uid and exit with skip code instead.
Signed-off-by Shuah Khan <[email protected]>--- tools/testing/selftests/livepatch/functions.sh | 15 ++++++++++++++- tools/testing/selftests/livepatch/test-state.sh | 3 +-- 2 files changed, 15 insertions(+), 3 deletions(-)tools/testing/selftests/livepatch/functions.sh +14
-1@@ -7,6 +7,9 @@ MAX_RETRIES=600 RETRY_INTERVAL=".1" # seconds +# Kselftest framework requirement - SKIP code is 4 +ksft_skip=4 + # log(msg) - write message to kernel log # msg - insightful words function log() {@@ -18,7 +21,16 @@ function log() { function skip() { log "SKIP: $1" echo "SKIP: $1" >&2 - exit 4 + exit $ksft_skip +} + +# root test +function is_root() { + uid=$(id -u) + if [ $uid -ne 0 ]; then + echo "skip all tests: must be run as root" >&2 + exit $ksft_skip + fi } # die(msg) - game over, man@@ -62,6 +74,7 @@ function set_ftrace_enabled() { # for verbose livepatching output and turn on # the ftrace_enabled sysctl. function setup_config() { + is_root push_config set_dynamic_debug set_ftrace_enabled 1tools/testing/selftests/livepatch/test-state.sh +1
-2@@ -8,8 +8,7 @@ MOD_LIVEPATCH=test_klp_state MOD_LIVEPATCH2=test_klp_state2 MOD_LIVEPATCH3=test_klp_state3 -set_dynamic_debug - +setup_config # TEST: Loading and removing a module that modifies the system stateSignature · 1 line
2.20.1
Thanks for fixing these, Shuah.
-- Joe
Quoted 10 lines · Shuah Khan
livepatch test configures the system and debug environment to run tests. Some of these actions fail without root access and test dumps several permission denied messages before it exits.
Fix
test-state.shto callsetup_configinstead ofset_dynamic_debugas suggested by Petr Mladek <[email protected]>Fix it to check root uid and exit with skip code instead.
Signed-off-by Shuah Khan <[email protected]>
Shuah, I assume that you will push this fix via linux-kselftest tree. Please, tell us if you have other preference.
Best Regards,
Petr
Shuah Khan
maintainerQuoted 8 lines · Petr Mladek
Quoted 7 lines · Shuah Khan
livepatch test configures the system and debug environment to run tests. Some of these actions fail without root access and test dumps several permission denied messages before it exits.
Fix
test-state.shto callsetup_configinstead ofset_dynamic_debugas suggested by Petr Mladek <[email protected]>
Quoted 9 lines
Quoted 3 lines
Fix it to check root uid and exit with skip code instead.
Signed-off-by Shuah Khan <[email protected]>Reviewed-by Petr Mladek <[email protected]>Shuah, I assume that you will push this fix via linux-kselftest tree. Please, tell us if you have other preference.
Hi Petr, Yes I will push this in. Thanks for the reviews.
thanks,
-- Shuah