Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

test_sysctl: add dedicated proc sysctl test driver

The existing tools/testing/selftests/sysctl/ tests include two test
cases, but these use existing production kernel sysctl interfaces. We
want to expand test coverage but we can't just be looking for random
safe production values to poke at, that's just insane!

Instead just dedicate a test driver for debugging purposes and port the
existing scripts to use it. This will make it easier for further tests
to be added.

Subsequent patches will extend our test coverage for sysctl.

The stress test driver uses a new license (GPL on Linux, copyleft-next
outside of Linux). Linus was fine with this [0] and later due to Ted's
and Alans's request ironed out an "or" language clause to use [1] which
is already present upstream.

[0] https://lkml.kernel.org/r/CA+55aFyhxcvD+q7tp+-yrSFDKfR0mOHgyEAe=f_94aKLsOu0Og@mail.gmail.com
[1] https://lkml.kernel.org/r/1495234558.7848.122.camel@linux.intel.com

Link: http://lkml.kernel.org/r/20170630224431.17374-2-mcgrof@kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
Acked-by: Kees Cook <keescook@chromium.org>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Luis R. Rodriguez and committed by
Linus Torvalds
9308f2f9 61d9b56a

+130 -4
+11
lib/Kconfig.debug
··· 1785 1785 1786 1786 If unsure, say N. 1787 1787 1788 + config TEST_SYSCTL 1789 + tristate "sysctl test driver" 1790 + default n 1791 + depends on PROC_SYSCTL 1792 + help 1793 + This builds the "test_sysctl" module. This driver enables to test the 1794 + proc sysctl interfaces available to drivers safely without affecting 1795 + production knobs which might alter system functionality. 1796 + 1797 + If unsure, say N. 1798 + 1788 1799 config TEST_UDELAY 1789 1800 tristate "udelay test driver" 1790 1801 default n
+1
lib/Makefile
··· 46 46 obj-y += kstrtox.o 47 47 obj-$(CONFIG_TEST_BPF) += test_bpf.o 48 48 obj-$(CONFIG_TEST_FIRMWARE) += test_firmware.o 49 + obj-$(CONFIG_TEST_SYSCTL) += test_sysctl.o 49 50 obj-$(CONFIG_TEST_HASH) += test_hash.o test_siphash.o 50 51 obj-$(CONFIG_TEST_KASAN) += test_kasan.o 51 52 obj-$(CONFIG_TEST_KSTRTOX) += test-kstrtox.o
+113
lib/test_sysctl.c
··· 1 + /* 2 + * proc sysctl test driver 3 + * 4 + * Copyright (C) 2017 Luis R. Rodriguez <mcgrof@kernel.org> 5 + * 6 + * This program is free software; you can redistribute it and/or modify it 7 + * under the terms of the GNU General Public License as published by the Free 8 + * Software Foundation; either version 2 of the License, or at your option any 9 + * later version; or, when distributed separately from the Linux kernel or 10 + * when incorporated into other software packages, subject to the following 11 + * license: 12 + * 13 + * This program is free software; you can redistribute it and/or modify it 14 + * under the terms of copyleft-next (version 0.3.1 or later) as published 15 + * at http://copyleft-next.org/. 16 + */ 17 + 18 + /* 19 + * This module provides an interface to the the proc sysctl interfaces. This 20 + * driver requires CONFIG_PROC_SYSCTL. It will not normally be loaded by the 21 + * system unless explicitly requested by name. You can also build this driver 22 + * into your kernel. 23 + */ 24 + 25 + #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 26 + 27 + #include <linux/init.h> 28 + #include <linux/list.h> 29 + #include <linux/module.h> 30 + #include <linux/printk.h> 31 + #include <linux/fs.h> 32 + #include <linux/miscdevice.h> 33 + #include <linux/slab.h> 34 + #include <linux/uaccess.h> 35 + #include <linux/async.h> 36 + #include <linux/delay.h> 37 + #include <linux/vmalloc.h> 38 + 39 + static int i_zero; 40 + static int i_one_hundred = 100; 41 + 42 + struct test_sysctl_data { 43 + int int_0001; 44 + char string_0001[65]; 45 + }; 46 + 47 + static struct test_sysctl_data test_data = { 48 + .int_0001 = 60, 49 + .string_0001 = "(none)", 50 + }; 51 + 52 + /* These are all under /proc/sys/debug/test_sysctl/ */ 53 + static struct ctl_table test_table[] = { 54 + { 55 + .procname = "int_0001", 56 + .data = &test_data.int_0001, 57 + .maxlen = sizeof(int), 58 + .mode = 0644, 59 + .proc_handler = proc_dointvec_minmax, 60 + .extra1 = &i_zero, 61 + .extra2 = &i_one_hundred, 62 + }, 63 + { 64 + .procname = "string_0001", 65 + .data = &test_data.string_0001, 66 + .maxlen = sizeof(test_data.string_0001), 67 + .mode = 0644, 68 + .proc_handler = proc_dostring, 69 + }, 70 + { } 71 + }; 72 + 73 + static struct ctl_table test_sysctl_table[] = { 74 + { 75 + .procname = "test_sysctl", 76 + .maxlen = 0, 77 + .mode = 0555, 78 + .child = test_table, 79 + }, 80 + { } 81 + }; 82 + 83 + static struct ctl_table test_sysctl_root_table[] = { 84 + { 85 + .procname = "debug", 86 + .maxlen = 0, 87 + .mode = 0555, 88 + .child = test_sysctl_table, 89 + }, 90 + { } 91 + }; 92 + 93 + static struct ctl_table_header *test_sysctl_header; 94 + 95 + static int __init test_sysctl_init(void) 96 + { 97 + test_sysctl_header = register_sysctl_table(test_sysctl_root_table); 98 + if (!test_sysctl_header) 99 + return -ENOMEM; 100 + return 0; 101 + } 102 + late_initcall(test_sysctl_init); 103 + 104 + static void __exit test_sysctl_exit(void) 105 + { 106 + if (test_sysctl_header) 107 + unregister_sysctl_table(test_sysctl_header); 108 + } 109 + 110 + module_exit(test_sysctl_exit); 111 + 112 + MODULE_AUTHOR("Luis R. Rodriguez <mcgrof@kernel.org>"); 113 + MODULE_LICENSE("GPL");
+1
tools/testing/selftests/sysctl/config
··· 1 + CONFIG_TEST_SYSCTL=y
+2 -2
tools/testing/selftests/sysctl/run_numerictests
··· 1 1 #!/bin/sh 2 2 3 - SYSCTL="/proc/sys" 4 - TARGET="${SYSCTL}/vm/swappiness" 3 + SYSCTL="/proc/sys/debug/test_sysctl/" 4 + TARGET="${SYSCTL}/int_0001" 5 5 ORIG=$(cat "${TARGET}") 6 6 TEST_STR=$(( $ORIG + 1 )) 7 7
+2 -2
tools/testing/selftests/sysctl/run_stringtests
··· 1 1 #!/bin/sh 2 2 3 - SYSCTL="/proc/sys" 4 - TARGET="${SYSCTL}/kernel/domainname" 3 + SYSCTL="/proc/sys/debug/test_sysctl/" 4 + TARGET="${SYSCTL}/string_0001" 5 5 ORIG=$(cat "${TARGET}") 6 6 TEST_STR="Testing sysctl" 7 7