* [PATCH AUTOSEL 4.19 4/5] selftests: firmware: Fix it to do root uid check and skip [not found] <20200104033644.11121-1-sashal@kernel.org> @ 2020-01-04 3:36 ` Sasha Levin 2020-01-04 3:36 ` [PATCH AUTOSEL 4.19 5/5] rseq/selftests: Turn off timeout setting Sasha Levin 1 sibling, 0 replies; 2+ messages in thread From: Sasha Levin @ 2020-01-04 3:36 UTC (permalink / raw) To: linux-kernel, stable Cc: Shuah Khan, Greg Kroah-Hartman, Sasha Levin, linux-kselftest From: Shuah Khan <skhan@linuxfoundation.org> [ Upstream commit c65e41538b04e0d64a673828745a00cb68a24371 ] firmware attempts to load test modules that require root access and fail. Fix it to check for root uid and exit with skip code instead. Before this fix: selftests: firmware: fw_run_tests.sh modprobe: ERROR: could not insert 'test_firmware': Operation not permitted You must have the following enabled in your kernel: CONFIG_TEST_FIRMWARE=y CONFIG_FW_LOADER=y CONFIG_FW_LOADER_USER_HELPER=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y not ok 1 selftests: firmware: fw_run_tests.sh # SKIP With this fix: selftests: firmware: fw_run_tests.sh skip all tests: must be run as root not ok 1 selftests: firmware: fw_run_tests.sh # SKIP Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> Reviwed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- tools/testing/selftests/firmware/fw_lib.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/testing/selftests/firmware/fw_lib.sh b/tools/testing/selftests/firmware/fw_lib.sh index 1cbb12e284a6..8a853ace55a2 100755 --- a/tools/testing/selftests/firmware/fw_lib.sh +++ b/tools/testing/selftests/firmware/fw_lib.sh @@ -28,6 +28,12 @@ test_modprobe() check_mods() { + local uid=$(id -u) + if [ $uid -ne 0 ]; then + echo "skip all tests: must be run as root" >&2 + exit $ksft_skip + fi + trap "test_modprobe" EXIT if [ ! -d $DIR ]; then modprobe test_firmware -- 2.20.1 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH AUTOSEL 4.19 5/5] rseq/selftests: Turn off timeout setting [not found] <20200104033644.11121-1-sashal@kernel.org> 2020-01-04 3:36 ` [PATCH AUTOSEL 4.19 4/5] selftests: firmware: Fix it to do root uid check and skip Sasha Levin @ 2020-01-04 3:36 ` Sasha Levin 1 sibling, 0 replies; 2+ messages in thread From: Sasha Levin @ 2020-01-04 3:36 UTC (permalink / raw) To: linux-kernel, stable Cc: Mathieu Desnoyers, Shuah Khan, Thomas Gleixner, Peter Zijlstra, Paul E. McKenney, Boqun Feng, H . Peter Anvin, Paul Turner, Dmitry Vyukov, Sasha Levin, linux-kselftest From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> [ Upstream commit af9cb29c5488381083b0b5ccdfb3cd931063384a ] As the rseq selftests can run for a long period of time, disable the timeout that the general selftests have. Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: Shuah Khan <skhan@linuxfoundation.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: "Paul E. McKenney" <paulmck@linux.ibm.com> Cc: Boqun Feng <boqun.feng@gmail.com> Cc: "H . Peter Anvin" <hpa@zytor.com> Cc: Paul Turner <pjt@google.com> Cc: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- tools/testing/selftests/rseq/settings | 1 + 1 file changed, 1 insertion(+) create mode 100644 tools/testing/selftests/rseq/settings diff --git a/tools/testing/selftests/rseq/settings b/tools/testing/selftests/rseq/settings new file mode 100644 index 000000000000..e7b9417537fb --- /dev/null +++ b/tools/testing/selftests/rseq/settings @@ -0,0 +1 @@ +timeout=0 -- 2.20.1 ^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-01-04 3:37 UTC | newest] Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20200104033644.11121-1-sashal@kernel.org> 2020-01-04 3:36 ` [PATCH AUTOSEL 4.19 4/5] selftests: firmware: Fix it to do root uid check and skip Sasha Levin 2020-01-04 3:36 ` [PATCH AUTOSEL 4.19 5/5] rseq/selftests: Turn off timeout setting Sasha Levin
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).