From 49172046643df85bcd387c35ea8914311868b79a Mon Sep 17 00:00:00 2001 From: ebasov Date: Thu, 20 Feb 2025 14:36:08 +0300 Subject: [PATCH] Added more options --- SOURCES/config-6.1.124-x86_64-kcsan | 20 +++++++++++++++----- SOURCES/config-6.1.124-x86_64-kfence | 19 ++++++++++++++----- SPECS/kernel-6.1.spec | 5 ++++- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/SOURCES/config-6.1.124-x86_64-kcsan b/SOURCES/config-6.1.124-x86_64-kcsan index d845216..4051a88 100644 --- a/SOURCES/config-6.1.124-x86_64-kcsan +++ b/SOURCES/config-6.1.124-x86_64-kcsan @@ -1837,7 +1837,6 @@ CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m @@ -3342,7 +3341,6 @@ CONFIG_WLAN_VENDOR_SILABS=y # CONFIG_WLAN_VENDOR_ZYDAS is not set CONFIG_WLAN_VENDOR_QUANTENNA=y # CONFIG_QTNFMAC_PCIE is not set -CONFIG_MAC80211_HWSIM=m # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_VIRT_WIFI is not set CONFIG_WAN=y @@ -3369,7 +3367,6 @@ CONFIG_IEEE802154_DRIVERS=m # CONFIG_IEEE802154_ADF7242 is not set # CONFIG_IEEE802154_CA8210 is not set # CONFIG_IEEE802154_MCR20A is not set -CONFIG_IEEE802154_HWSIM=m # # Wireless WAN @@ -8539,7 +8536,6 @@ CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_SHRINKER_DEBUG is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set CONFIG_DEBUG_STACK_USAGE=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y @@ -8557,7 +8553,6 @@ CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y -# CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y # CONFIG_KFENCE is not set CONFIG_HAVE_ARCH_KMSAN=y @@ -8910,6 +8905,21 @@ CONFIG_ARCH_USE_MEMTEST=y CONFIG_HYPERV_TESTING=y CONFIG_INIT_STACK_ALL_PATTERN=n CONFIG_INIT_STACK_ALL_ZERO=n +CONFIG_KASAN=y +CONFIG_KASAN_INLINE=y +CONFIG_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000 +CONFIG_MAC80211_HWSIM=y +CONFIG_IEEE802154_HWSIM=y +CONFIG_BT_HCIVHCI=y +# CONFIG_UBSAN_MISC is not set +# CONFIG_UBSAN_OBJECT_SIZE is not set +# CONFIG_UBSAN_SIGNED_OVERFLOW is not set +# CONFIG_UBSAN_UNSIGNED_OVERFLOW is not set +# CONFIG_DEVKMEM is not set +CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y + # end of Kernel Testing and Coverage # diff --git a/SOURCES/config-6.1.124-x86_64-kfence b/SOURCES/config-6.1.124-x86_64-kfence index 53cc87d..26f8f21 100644 --- a/SOURCES/config-6.1.124-x86_64-kfence +++ b/SOURCES/config-6.1.124-x86_64-kfence @@ -1837,7 +1837,6 @@ CONFIG_BT_HCIUART_ATH3K=y CONFIG_BT_HCIBCM203X=m CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m -CONFIG_BT_HCIVHCI=m CONFIG_BT_MRVL=m CONFIG_BT_MRVL_SDIO=m CONFIG_BT_ATH3K=m @@ -3342,7 +3341,6 @@ CONFIG_WLAN_VENDOR_SILABS=y # CONFIG_WLAN_VENDOR_ZYDAS is not set CONFIG_WLAN_VENDOR_QUANTENNA=y # CONFIG_QTNFMAC_PCIE is not set -CONFIG_MAC80211_HWSIM=m # CONFIG_USB_NET_RNDIS_WLAN is not set # CONFIG_VIRT_WIFI is not set CONFIG_WAN=y @@ -3369,7 +3367,6 @@ CONFIG_IEEE802154_DRIVERS=m # CONFIG_IEEE802154_ADF7242 is not set # CONFIG_IEEE802154_CA8210 is not set # CONFIG_IEEE802154_MCR20A is not set -CONFIG_IEEE802154_HWSIM=m # # Wireless WAN @@ -8524,7 +8521,6 @@ CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 # CONFIG_SHRINKER_DEBUG is not set CONFIG_HAVE_DEBUG_KMEMLEAK=y -# CONFIG_DEBUG_KMEMLEAK is not set CONFIG_DEBUG_STACK_USAGE=y CONFIG_SCHED_STACK_END_CHECK=y CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y @@ -8542,7 +8538,6 @@ CONFIG_HAVE_ARCH_KASAN=y CONFIG_HAVE_ARCH_KASAN_VMALLOC=y CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y -# CONFIG_KASAN is not set CONFIG_HAVE_ARCH_KFENCE=y CONFIG_KFENCE=y CONFIG_KFENCE_SAMPLE_INTERVAL=100 @@ -8900,6 +8895,20 @@ CONFIG_ARCH_USE_MEMTEST=y CONFIG_HYPERV_TESTING=y CONFIG_INIT_STACK_ALL_PATTERN=n CONFIG_INIT_STACK_ALL_ZERO=n +CONFIG_KASAN=y +CONFIG_KASAN_INLINE=y +CONFIG_DEBUG_KMEMLEAK=y +# CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN is not set +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000 +CONFIG_MAC80211_HWSIM=y +CONFIG_IEEE802154_HWSIM=y +CONFIG_BT_HCIVHCI=y +# CONFIG_UBSAN_MISC is not set +# CONFIG_UBSAN_OBJECT_SIZE is not set +# CONFIG_UBSAN_SIGNED_OVERFLOW is not set +# CONFIG_UBSAN_UNSIGNED_OVERFLOW is not set +# CONFIG_DEVKMEM is not set +CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING=y # end of Kernel Testing and Coverage # diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec index a5c2ec6..a0fdbf6 100644 --- a/SPECS/kernel-6.1.spec +++ b/SPECS/kernel-6.1.spec @@ -50,7 +50,7 @@ %endif # Set pkg_release. -%global pkg_release 7%{?buildid}.%{?lvc}%{?dist}.inferit.fuzzing +%global pkg_release 8%{?buildid}.%{?lvc}%{?dist}.inferit.fuzzing # Architectures upon which we can sign the kernel # for secure boot authentication. @@ -1771,6 +1771,9 @@ fi %endif %changelog +* Wed Feb 20 2025 Eduard Basov - 6.1.124-8.lvc13.inferit.fuzzing +- Added more options ( KCSAN, KFENCE ) + * Wed Feb 19 2025 Eduard Basov - 6.1.124-7.lvc13.inferit.fuzzing - Added variant kernel ( KCSAN, KFENCE )