Skip to content

Commit 23756e5

Browse files
ebiggerstorvalds
authored andcommitted
selftests: kmod: test disabling module autoloading
Test that request_module() fails with -ENOENT when /proc/sys/kernel/modprobe contains (a) a nonexistent path, and (b) an empty path. Case (b) is a regression test for the patch "kmod: make request_module() return an error when autoloading is disabled". Tested with 'kmod.sh -t 0010 && kmod.sh -t 0011', and also simply with 'kmod.sh' to run all kmod tests. Signed-off-by: Eric Biggers <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Acked-by: Luis Chamberlain <[email protected]> Cc: Alexei Starovoitov <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Jeff Vander Stoep <[email protected]> Cc: Jessica Yu <[email protected]> Cc: Kees Cook <[email protected]> Cc: NeilBrown <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent 6d573a0 commit 23756e5

File tree

1 file changed

+30
-0
lines changed
  • tools/testing/selftests/kmod

1 file changed

+30
-0
lines changed

tools/testing/selftests/kmod/kmod.sh

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ ALL_TESTS="$ALL_TESTS 0006:10:1"
6161
ALL_TESTS="$ALL_TESTS 0007:5:1"
6262
ALL_TESTS="$ALL_TESTS 0008:150:1"
6363
ALL_TESTS="$ALL_TESTS 0009:150:1"
64+
ALL_TESTS="$ALL_TESTS 0010:1:1"
65+
ALL_TESTS="$ALL_TESTS 0011:1:1"
6466

6567
# Kselftest framework requirement - SKIP code is 4.
6668
ksft_skip=4
@@ -149,6 +151,7 @@ function load_req_mod()
149151

150152
test_finish()
151153
{
154+
echo "$MODPROBE" > /proc/sys/kernel/modprobe
152155
echo "Test completed"
153156
}
154157

@@ -443,6 +446,30 @@ kmod_test_0009()
443446
config_expect_result ${FUNCNAME[0]} SUCCESS
444447
}
445448

449+
kmod_test_0010()
450+
{
451+
kmod_defaults_driver
452+
config_num_threads 1
453+
echo "/KMOD_TEST_NONEXISTENT" > /proc/sys/kernel/modprobe
454+
config_trigger ${FUNCNAME[0]}
455+
config_expect_result ${FUNCNAME[0]} -ENOENT
456+
echo "$MODPROBE" > /proc/sys/kernel/modprobe
457+
}
458+
459+
kmod_test_0011()
460+
{
461+
kmod_defaults_driver
462+
config_num_threads 1
463+
# This causes the kernel to not even try executing modprobe. The error
464+
# code is still -ENOENT like when modprobe doesn't exist, so we can't
465+
# easily test for the exact difference. But this still is a useful test
466+
# since there was a bug where request_module() returned 0 in this case.
467+
echo > /proc/sys/kernel/modprobe
468+
config_trigger ${FUNCNAME[0]}
469+
config_expect_result ${FUNCNAME[0]} -ENOENT
470+
echo "$MODPROBE" > /proc/sys/kernel/modprobe
471+
}
472+
446473
list_tests()
447474
{
448475
echo "Test ID list:"
@@ -460,6 +487,8 @@ list_tests()
460487
echo "0007 x $(get_test_count 0007) - multithreaded tests with default setup test request_module() and get_fs_type()"
461488
echo "0008 x $(get_test_count 0008) - multithreaded - push kmod_concurrent over max_modprobes for request_module()"
462489
echo "0009 x $(get_test_count 0009) - multithreaded - push kmod_concurrent over max_modprobes for get_fs_type()"
490+
echo "0010 x $(get_test_count 0010) - test nonexistent modprobe path"
491+
echo "0011 x $(get_test_count 0011) - test completely disabling module autoloading"
463492
}
464493

465494
usage()
@@ -616,6 +645,7 @@ test_reqs
616645
allow_user_defaults
617646
load_req_mod
618647

648+
MODPROBE=$(</proc/sys/kernel/modprobe)
619649
trap "test_finish" EXIT
620650

621651
parse_args $@

0 commit comments

Comments
 (0)