diff --git a/SOURCES/kernel-x86_64-debug-rhel.config b/SOURCES/kernel-x86_64-debug-rhel.config index 132da7c..6141fc6 100644 --- a/SOURCES/kernel-x86_64-debug-rhel.config +++ b/SOURCES/kernel-x86_64-debug-rhel.config @@ -1117,7 +1117,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" @@ -1618,7 +1618,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 @@ -1638,7 +1638,7 @@ CONFIG_FAT_KUNIT_TEST=m # CONFIG_FAULT_INJECTION_CONFIGFS is not set 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 @@ -1715,6 +1715,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 @@ -2707,7 +2708,10 @@ 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_KCOV_IRQ_AREA_SIZE=0x40000 # CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KDB_DEFAULT_ENABLE=0x0 @@ -2914,6 +2918,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 @@ -4310,6 +4315,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 @@ -4418,7 +4424,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=y is not set CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT=y CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set @@ -4431,7 +4437,7 @@ CONFIG_RATIONAL_KUNIT_TEST=m # CONFIG_RBTREE_TEST is not set # CONFIG_RC_CORE is not set # CONFIG_RCU_CPU_STALL_CPUTIME 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 @@ -6725,7 +6731,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 fe5aefc..2561ef2 100644 --- a/SOURCES/kernel-x86_64-rhel.config +++ b/SOURCES/kernel-x86_64-rhel.config @@ -1109,7 +1109,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" @@ -2687,7 +2687,10 @@ 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_KCOV_IRQ_AREA_SIZE=0x40000 # CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 CONFIG_KDB_DEFAULT_ENABLE=0x0 @@ -4397,7 +4400,7 @@ CONFIG_RADIO_TEA575X=m # CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set -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 @@ -4410,7 +4413,7 @@ CONFIG_RATIONAL_KUNIT_TEST=m # CONFIG_RBTREE_TEST is not set # CONFIG_RC_CORE is not set # CONFIG_RCU_CPU_STALL_CPUTIME 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 fc1cf8e..3d26dbe 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -201,24 +201,24 @@ Summary: The Linux kernel # kernel-64k (aarch64 kernel with 64K page_size) %define with_arm64_64k %{?_without_arm64_64k: 0} %{?!_without_arm64_64k: 1} # kernel-rt (x86_64 and aarch64 only PREEMPT_RT enabled kernel) -%define with_realtime %{?_without_realtime: 0} %{?!_without_realtime: 1} +%define with_realtime 0 # kernel-doc %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers %define with_headers %{?_without_headers: 0} %{?!_without_headers: 1} %define with_cross_headers %{?_without_cross_headers: 0} %{?!_without_cross_headers: 1} # perf -%define with_perf %{?_without_perf: 0} %{?!_without_perf: 1} +%define with_perf 0 # tools -%define with_tools %{?_without_tools: 0} %{?!_without_tools: 1} +%define with_tools 0 # bpf tool -%define with_bpftool %{?_without_bpftool: 0} %{?!_without_bpftool: 1} +%define with_bpftool 0 # kernel-debuginfo %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-abi-stablelists %define with_kernel_abi_stablelists %{?_without_kernel_abi_stablelists: 0} %{?!_without_kernel_abi_stablelists: 1} # internal samples and selftests -%define with_selftests %{?_without_selftests: 0} %{?!_without_selftests: 1} +%define with_selftests 0 # # Additional options for user-friendly one-off kernel building: # @@ -231,7 +231,7 @@ Summary: The Linux kernel # Only build the realtime kernel (--with rtonly): %define with_rtonly %{?_with_rtonly: 1} %{?!_with_rtonly: 0} # Control whether we perform a compat. check against published ABI. -%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1} +%define with_kabichk 0 # Control whether we perform a compat. check against DUP ABI. %define with_kabidupchk %{?_with_kabidupchk: 1} %{?!_with_kabidupchk: 0} # @@ -253,7 +253,7 @@ Summary: The Linux kernel %define with_release %{?_with_release: 1} %{?!_with_release: 0} # verbose build, i.e. no silent rules and V=1 -%define with_verbose %{?_with_verbose: 1} %{?!_with_verbose: 0} +%define with_verbose 0 # # check for mismatched config options @@ -629,7 +629,7 @@ Name: kernel License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib 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} @@ -652,6 +652,7 @@ Provides: installonlypkg(kernel) BuildRequires: kmod, bash, coreutils, tar, git-core, which BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk, %compression BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ +BuildRequires: gcc-plugin-annobin BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel @@ -1734,6 +1735,9 @@ pathfix.py -i "%{__python3} %{py3_shbang_opts}" -p -n \ Documentation \ scripts/clang-tools +# Is it necessary? +sed -i 's/GCC_VERSION >= 120000/GCC_VERSION >= 110000/' lib/Kconfig.debug + # only deal with configs if we are going to build for the arch %ifnarch %nobuildarches @@ -3729,6 +3733,11 @@ fi # # %changelog +* Mon Nov 18 2024 Arkady L. Shane - [5.14.0-427.42.1.el9_4.inferit.fuzzing] +- Enable fuzzing iptions: + https://github.com/google/syzkaller/blob/master/docs/linux/kernel_configs.md +- Disable rt, perf, tools, bpftool, selftests, kabi check + * Fri Oct 18 2024 Scott Weaver [5.14.0-427.42.1.el9_4] - redhat/configs: Add CONFIG_MITIGATION_SPECTRE_BHI (Waiman Long) [RHEL-45492 RHEL-28203] {CVE-2024-2201} - x86/bugs: Fix BHI retpoline check (Waiman Long) [RHEL-45492 RHEL-28203] {CVE-2024-2201}