4 files changed, 0 insertions, 17 deletions

diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 46f656b8fc23..e7705dde953f 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -11,7 +11,6 @@ config PARISC
         select ARCH_HAS_ELF_RANDOMIZE
         select ARCH_HAS_STRICT_KERNEL_RWX
         select ARCH_HAS_UBSAN_SANITIZE_ALL
-        select ARCH_WANTS_UBSAN_NO_NULL
         select ARCH_SUPPORTS_MEMORY_FAILURE
         select RTC_CLASS
         select RTC_DRV_GENERIC
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 8a1863d9ed53..4fe5b2affa23 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -106,7 +106,6 @@ config S390
         select ARCH_USE_BUILTIN_BSWAP
         select ARCH_USE_CMPXCHG_LOCKREF
         select ARCH_WANTS_DYNAMIC_TASK_STRUCT
-        select ARCH_WANTS_UBSAN_NO_NULL
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT
         select CLONE_BACKWARDS2
diff --git a/lib/Kconfig.ubsan b/lib/Kconfig.ubsan
index 19d42ea75ec2..98fa559ebd80 100644
--- a/lib/Kconfig.ubsan
+++ b/lib/Kconfig.ubsan
@@ -1,9 +1,6 @@
 config ARCH_HAS_UBSAN_SANITIZE_ALL
         bool
 
-config ARCH_WANTS_UBSAN_NO_NULL
-        def_bool n
-
 config UBSAN
         bool "Undefined behaviour sanity checker"
         help
@@ -39,14 +36,6 @@ config UBSAN_ALIGNMENT
           Enabling this option on architectures that support unaligned
           accesses may produce a lot of false positives.
 
-config UBSAN_NULL
-        bool "Enable checking of null pointers"
-        depends on UBSAN
-        default y if !ARCH_WANTS_UBSAN_NO_NULL
-        help
-          This option enables detection of memory accesses via a
-          null pointer.
-
 config TEST_UBSAN
         tristate "Module for testing for undefined behavior detection"
         depends on m && UBSAN
diff --git a/scripts/Makefile.ubsan b/scripts/Makefile.ubsan
index b593b36ccff8..38b2b4818e8e 100644
--- a/scripts/Makefile.ubsan
+++ b/scripts/Makefile.ubsan
@@ -14,10 +14,6 @@ ifdef CONFIG_UBSAN_ALIGNMENT
       CFLAGS_UBSAN += $(call cc-option, -fsanitize=alignment)
 endif
 
-ifdef CONFIG_UBSAN_NULL
-      CFLAGS_UBSAN += $(call cc-option, -fsanitize=null)
-endif
-
       # -fsanitize=* options makes GCC less smart than usual and
       # increase number of 'maybe-uninitialized false-positives
       CFLAGS_UBSAN += $(call cc-option, -Wno-maybe-uninitialized)