Adding changes from the i9-fuzzing branch

3 weeks ago · a0e449d3e9
parent a9ba47add9
commit a0e449d3e9
3 changed files with 36 additions and 22 deletions
--- a/SOURCES/kernel-x86_64-debug-rhel.config
+++ b/SOURCES/kernel-x86_64-debug-rhel.config
@ -1115,7 +1115,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"
@ -1639,7 +1639,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
@ -1659,7 +1659,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
@ -1737,6 +1737,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
@ -2733,7 +2734,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
@ -4480,7 +4483,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_KSTACK_OFFSET=y
 CONFIG_RANDOMIZE_MEMORY=y
@ -4495,7 +4498,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
@ -6815,7 +6818,7 @@ CONFIG_WLAN=y
 CONFIG_WMI_BMOF=m
 # CONFIG_WQ_CPU_INTENSIVE_REPORT is not set
 # 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
--- a/SOURCES/kernel-x86_64-rhel.config
+++ b/SOURCES/kernel-x86_64-rhel.config
@ -1108,7 +1108,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"
@ -2714,7 +2714,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
@ -4475,7 +4477,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
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@ -201,24 +201,25 @@ 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      %%{?_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 +232,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
 # Temporarily disable kabi checks until RC.
 %define with_kabichk 0
 # Control whether we perform a compat. check against DUP ABI.
@ -255,7 +256,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
@ -593,7 +594,7 @@ Summary: The Linux kernel
 %define cpupowerarchs %{ix86} x86_64 ppc64le %{arm} aarch64
 %else
 %define cpupowerarchs i686 x86_64 ppc64le aarch64
-%endif
+endif

 %if 0%{?use_vdso}

@ -631,7 +632,8 @@ 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.0.fuzzing
+
 # DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
 # SET %%nobuildarches (ABOVE) INSTEAD
 %if 0%{?fedora}
@ -653,7 +655,8 @@ 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, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++, gcc-plugin-annobin
+#BuildRequires: gcc-toolset-12-gcc, gcc-toolset-12-gcc-c++, gcc-toolset-12-gcc-plugin-annobin
 BuildRequires: net-tools, hostname, bc, elfutils-devel
 BuildRequires: dwarves
 BuildRequires: python3-devel
@ -1755,6 +1758,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

@ -3802,9 +3808,12 @@ fi
 #
 #
 %changelog
-* Thu Dec 5 2024 Eduard Basov <ebasov@msvsphere-os.ru> [5.14.0-503.15.1.el9_5]
+* Thu Dec 5 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 5.14.0-503.15.1.inferit.0.fuzzing
 - Rebuild for MSVSphere 9.5
- Added 1289 new options 
+- Added 1289 new options for debug conf
+- Enable fuzzing iptions:
+  https://github.com/google/syzkaller/blob/master/docs/linux/kernel_configs.md
+- Disable rt, perf, tools, bpftool, selftests, kabi check

 * Thu Nov 14 2024 Lucas Zampieri <lzampier@redhat.com> [5.14.0-503.15.1.el9_5]
 - USB: serial: mos7840: fix crash on resume (Desnes Nunes) [RHEL-65484 RHEL-59050] {CVE-2024-42244}