From 0940acac40a0b5e0fb528cbc7a427533982175e8 Mon Sep 17 00:00:00 2001 From: tigro Date: Mon, 29 Jan 2024 17:42:30 +0300 Subject: [PATCH] Enable fuzzing iptions: https://github.com/google/syzkaller/blob/master/docs/linux/kernel_configs.md --- SOURCES/kernel-x86_64-debug-rhel.config | 19 ++++++++++++------- SOURCES/kernel-x86_64-rhel.config | 8 +++++--- SPECS/kernel.spec | 8 ++++++-- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index 8414735..806aa2b 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1097,7 +1097,7 @@ CONFIG_DEFAULT_CUBIC=y CONFIG_DEFAULT_FQ_CODEL=y # CONFIG_DEFAULT_FQ is not set CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=140 CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DEFAULT_NET_SCH="fq_codel" @@ -1578,7 +1578,7 @@ CONFIG_EXTRA_FIRMWARE="" # CONFIG_F2FS_FS is not set # CONFIG_F71808E_WDT is not set # CONFIG_FAIL_FUNCTION is not set -# CONFIG_FAIL_FUTEX is not set +CONFIG_FAIL_FUTEX=y CONFIG_FAIL_IO_TIMEOUT=y CONFIG_FAIL_MAKE_REQUEST=y CONFIG_FAIL_MMC_REQUEST=y @@ -1597,7 +1597,7 @@ CONFIG_FAT_FS=m CONFIG_FAT_KUNIT_TEST=m CONFIG_FAULT_INJECTION_DEBUG_FS=y CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y -# CONFIG_FAULT_INJECTION_USERCOPY is not set +CONFIG_FAULT_INJECTION_USERCOPY=y CONFIG_FAULT_INJECTION=y # CONFIG_FB_3DFX is not set # CONFIG_FB_ARC is not set @@ -1674,6 +1674,7 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FONT_SUPPORT=y +CONFIG_REFCOUNT_FULL=y CONFIG_FORTIFY_SOURCE=y # CONFIG_FPGA is not set CONFIG_FPROBE=y @@ -2650,7 +2651,9 @@ CONFIG_KASAN_KUNIT_TEST=m # CONFIG_KASAN_OUTLINE is not set CONFIG_KASAN_VMALLOC=y CONFIG_KASAN=y -# CONFIG_KCOV is not set +CONFIG_KCOV=y +CONFIG_KCOV_INSTRUMENT_ALL=y +CONFIG_KCOV_ENABLE_COMPARISONS=y # CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KDB_DEFAULT_ENABLE=0x0 @@ -2854,6 +2857,7 @@ CONFIG_LLC=m CONFIG_LOAD_UEFI_KEYS=y CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCKDEP=y CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_CHAINS_BITS=18 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 @@ -4232,6 +4236,7 @@ CONFIG_PROC_VMCORE=y CONFIG_PROFILING=y # CONFIG_PROVE_CXL_LOCKING is not set CONFIG_PROVE_LOCKING=y +CONFIG_PROVE_RCU=y CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PROVIDE_OHCI1394_DMA_INIT=y @@ -4339,7 +4344,7 @@ CONFIG_RADIO_TEA575X=m # CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_RAID_ATTRS=m CONFIG_RANDOM32_SELFTEST=y -CONFIG_RANDOMIZE_BASE=y +# CONFIG_RANDOMIZE_BASE is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set @@ -4350,7 +4355,7 @@ CONFIG_RAS=y CONFIG_RATIONAL_KUNIT_TEST=m # CONFIG_RBTREE_TEST is not set # CONFIG_RC_CORE is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 +CONFIG_RCU_CPU_STALL_TIMEOUT=100 # CONFIG_RCU_EQS_DEBUG is not set CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set @@ -6612,7 +6617,7 @@ CONFIG_WLAN_VENDOR_REALTEK=y CONFIG_WLAN=y CONFIG_WMI_BMOF=m # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -# CONFIG_WQ_WATCHDOG is not set +CONFIG_WQ_WATCHDOG=y CONFIG_WWAN_HWSIM=m CONFIG_WWAN=y # CONFIG_WW_MUTEX_SELFTEST is not set diff --git a/SOURCES/kernel-x86_64-rhel.config b/SOURCES/kernel-x86_64-rhel.config index bae157a..5476737 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1089,7 +1089,7 @@ CONFIG_DEFAULT_CUBIC=y CONFIG_DEFAULT_FQ_CODEL=y # CONFIG_DEFAULT_FQ is not set CONFIG_DEFAULT_HOSTNAME="(none)" -CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=140 CONFIG_DEFAULT_INIT="" CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 CONFIG_DEFAULT_NET_SCH="fq_codel" @@ -2630,7 +2630,9 @@ CONFIG_KALLSYMS=y # CONFIG_KASAN is not set # CONFIG_KASAN_MODULE_TEST is not set # CONFIG_KASAN_VMALLOC is not set -# CONFIG_KCOV is not set +CONFIG_KCOV=y +CONFIG_KCOV_INSTRUMENT_ALL=y +CONFIG_KCOV_ENABLE_COMPARISONS=y # CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KDB_DEFAULT_ENABLE=0x0 @@ -4329,7 +4331,7 @@ CONFIG_RAS=y CONFIG_RATIONAL_KUNIT_TEST=m # CONFIG_RBTREE_TEST is not set # CONFIG_RC_CORE is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=60 +CONFIG_RCU_CPU_STALL_TIMEOUT=100 # CONFIG_RCU_EQS_DEBUG is not set CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RCU_EXPERT is not set diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index e7b5b91..0d63040 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -627,7 +627,7 @@ Name: kernel License: GPLv2 and Redistributable, no modification permitted URL: https://www.kernel.org/ Version: %{specversion} -Release: %{pkg_release} +Release: %{pkg_release}.inferit+fuzzing # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD. # SET %%nobuildarches (ABOVE) INSTEAD %if 0%{?fedora} @@ -3723,6 +3723,10 @@ fi # # %changelog +* Mon Jan 29 2024 Arkady L. Shane - 5.14.0-362.18.1.inferit+fuzzing +- Enable fuzzing iptions: + https://github.com/google/syzkaller/blob/master/docs/linux/kernel_configs.md + * Wed Jan 03 2024 Jan Stancek [5.14.0-362.18.1.el9_3] - nfp: fix use-after-free in area_cache_get() (Ricardo Robaina) [RHEL-19456 RHEL-19536 RHEL-6566 RHEL-7241] {CVE-2022-3545} - rtla: Fix uninitialized variable found (John Kacur) [RHEL-18360 RHEL-10079] @@ -22158,7 +22162,7 @@ fi - ovl: fix use after free in struct ovl_aio_req (Miklos Szeredi) [2176161] {CVE-2023-1252} - ovl: fail on invalid uid/gid mapping at copy up (Miklos Szeredi) [2165345] {CVE-2023-0386} -* Thu Apr 12 2023 Eugene Zamriy [5.14.0-284.11.1.el9_2] +* Wed Apr 12 2023 Eugene Zamriy [5.14.0-284.11.1.el9_2] - Modified to use MSVSphere Secure Boot certificates - Rebuilt for MSVSphere 9.2