aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert van der Linde <alinde@google.com>2020-09-09 09:55:37 +0000
committerDmitry Vyukov <dvyukov@google.com>2020-09-09 14:39:22 +0200
commitac7ca78e73a05a08918dd014f40739b3bbc26ea6 (patch)
tree7c92cd34990c925e1dbf5cf23f37a6d490d8585b
parent0ea7a8875d3f20d3bdf6323495521b62ef71878c (diff)
dashboard/config: enable CONFIG_FAULT_INJECTION_USERCOPY
As CONFIG_FAULT_INJECTION_USERCOPY is already included in linux-next, enable the config. Fixes #1979
-rw-r--r--dashboard/config/android/config-5.41
-rw-r--r--dashboard/config/bits-syzbot.config1
-rw-r--r--dashboard/config/upstream-kasan.config1
-rw-r--r--dashboard/config/upstream-kcsan.config1
-rw-r--r--dashboard/config/upstream-kmsan.config1
-rw-r--r--dashboard/config/upstream-leak.config1
-rw-r--r--dashboard/config/upstream-usb.config1
-rw-r--r--docs/linux/kernel_configs.md1
8 files changed, 8 insertions, 0 deletions
diff --git a/dashboard/config/android/config-5.4 b/dashboard/config/android/config-5.4
index ae8e677d7..707c3c6a2 100644
--- a/dashboard/config/android/config-5.4
+++ b/dashboard/config/android/config-5.4
@@ -6037,6 +6037,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=21
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/dashboard/config/bits-syzbot.config b/dashboard/config/bits-syzbot.config
index ecbc7ec88..c3df8a065 100644
--- a/dashboard/config/bits-syzbot.config
+++ b/dashboard/config/bits-syzbot.config
@@ -105,6 +105,7 @@ CONFIG_PRINTK_TIME=y
### Fault injection
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/dashboard/config/upstream-kasan.config b/dashboard/config/upstream-kasan.config
index 2e98b9d12..1d5b5bc5a 100644
--- a/dashboard/config/upstream-kasan.config
+++ b/dashboard/config/upstream-kasan.config
@@ -6939,6 +6939,7 @@ CONFIG_UNWINDER_ORC=y
# CONFIG_KUNIT is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/dashboard/config/upstream-kcsan.config b/dashboard/config/upstream-kcsan.config
index 8c11beee9..5f218d784 100644
--- a/dashboard/config/upstream-kcsan.config
+++ b/dashboard/config/upstream-kcsan.config
@@ -8416,6 +8416,7 @@ CONFIG_UNWINDER_ORC=y
# CONFIG_KUNIT is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/dashboard/config/upstream-kmsan.config b/dashboard/config/upstream-kmsan.config
index 0c887bdf2..1a25398e0 100644
--- a/dashboard/config/upstream-kmsan.config
+++ b/dashboard/config/upstream-kmsan.config
@@ -8184,6 +8184,7 @@ CONFIG_UNWINDER_FRAME_POINTER=y
# CONFIG_KUNIT is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/dashboard/config/upstream-leak.config b/dashboard/config/upstream-leak.config
index f94263ee6..f69bafd20 100644
--- a/dashboard/config/upstream-leak.config
+++ b/dashboard/config/upstream-leak.config
@@ -6635,6 +6635,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=100
# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/dashboard/config/upstream-usb.config b/dashboard/config/upstream-usb.config
index c7742b902..0df762184 100644
--- a/dashboard/config/upstream-usb.config
+++ b/dashboard/config/upstream-usb.config
@@ -7232,6 +7232,7 @@ CONFIG_UNWINDER_ORC=y
# CONFIG_KUNIT is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
CONFIG_FAULT_INJECTION=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y
diff --git a/docs/linux/kernel_configs.md b/docs/linux/kernel_configs.md
index 76698bd2b..6fc8b33af 100644
--- a/docs/linux/kernel_configs.md
+++ b/docs/linux/kernel_configs.md
@@ -83,6 +83,7 @@ For testing with fault injection enable the following configs (syzkaller will pi
```
CONFIG_FAULT_INJECTION=y
CONFIG_FAULT_INJECTION_DEBUG_FS=y
+CONFIG_FAULT_INJECTION_USERCOPY=y
CONFIG_FAILSLAB=y
CONFIG_FAIL_PAGE_ALLOC=y
CONFIG_FAIL_MAKE_REQUEST=y