From 51c8114178869c773533503c6118149ec0115aa8 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 20 Jan 2022 17:01:15 -0600 Subject: kernel-5.17-0.rc0.20220120gitfa2e1ba3e9e3.71 * Thu Jan 20 2022 Fedora Kernel Team [5.17-0.rc0.20220120gitfa2e1ba3e9e3.71] - Fixup merge in random.c (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 ++ kernel-aarch64-debug-fedora.config | 2 ++ kernel-aarch64-debug-rhel.config | 2 ++ kernel-aarch64-fedora.config | 2 ++ kernel-aarch64-rhel.config | 2 ++ kernel-armv7hl-debug-fedora.config | 2 ++ kernel-armv7hl-fedora.config | 2 ++ kernel-armv7hl-lpae-debug-fedora.config | 2 ++ kernel-armv7hl-lpae-fedora.config | 2 ++ kernel-i686-debug-fedora.config | 2 ++ kernel-i686-fedora.config | 2 ++ kernel-ppc64le-debug-fedora.config | 2 ++ kernel-ppc64le-debug-rhel.config | 2 ++ kernel-ppc64le-fedora.config | 2 ++ kernel-ppc64le-rhel.config | 2 ++ kernel-s390x-debug-fedora.config | 2 ++ kernel-s390x-debug-rhel.config | 2 ++ kernel-s390x-fedora.config | 2 ++ kernel-s390x-rhel.config | 2 ++ kernel-s390x-zfcpdump-rhel.config | 2 ++ kernel-x86_64-debug-fedora.config | 2 ++ kernel-x86_64-debug-rhel.config | 2 ++ kernel-x86_64-fedora.config | 2 ++ kernel-x86_64-rhel.config | 2 ++ kernel.spec | 15 ++++++---- patch-5.17-redhat.patch | 53 +++++++++++---------------------- sources | 6 ++-- 28 files changed, 79 insertions(+), 46 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index c004a3118..f8aab073e 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 70 +RHEL_RELEASE = 71 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 11d452542..9e93975f7 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/c1ee15318f4a2688057fd1aeee6272603d0871f0 + c1ee15318f4a2688057fd1aeee6272603d0871f0 Fixup merge in random.c + https://gitlab.com/cki-project/kernel-ark/-/commit/309ccf0b279d3f3e7a88fb8889defc10c5ffa818 309ccf0b279d3f3e7a88fb8889defc10c5ffa818 lib/crypto: add prompts back to crypto libraries diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a3814b016..a269d836f 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2425,6 +2425,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HD44780=m @@ -7518,6 +7519,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 55ab75e49..764591917 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -1855,6 +1855,7 @@ CONFIG_GVE=m CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5990,6 +5991,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index f474562e8..facd1cdb1 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2409,6 +2409,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HD44780=m @@ -7492,6 +7493,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index e92309b30..91bffd249 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -1839,6 +1839,7 @@ CONFIG_GVE=m CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5966,6 +5967,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 815fd1d00..c280fcdab 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -2448,6 +2448,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_PERF_REGS=y @@ -7709,6 +7710,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 7d7861c84..8a3b9cc94 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -2433,6 +2433,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_PERF_REGS=y @@ -7684,6 +7685,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 390095591..eb851e0d7 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -2395,6 +2395,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y @@ -7476,6 +7477,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index f2621a647..54e50eaa9 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -2380,6 +2380,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_HAVE_ARM_TWD=y @@ -7451,6 +7452,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index aefdd49ec..c1af3e314 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -2083,6 +2083,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDC2010=m @@ -6734,6 +6735,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 853188d08..41071884c 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -2066,6 +2066,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDC2010=m @@ -6709,6 +6710,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index ffc3714ae..f1ae4c8a7 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1954,6 +1954,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set CONFIG_HD44780=m @@ -6425,6 +6426,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 70dd47aa7..e1a945319 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1697,6 +1697,7 @@ CONFIG_GVE=m CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HCALL_STATS is not set # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set @@ -5758,6 +5759,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index acf3bebb3..6b63e8445 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1937,6 +1937,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HAVE_BOOTMEM_INFO_NODE=y # CONFIG_HCALL_STATS is not set CONFIG_HD44780=m @@ -6399,6 +6400,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 9fd9a1e99..e9907abc2 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1681,6 +1681,7 @@ CONFIG_GVE=m CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HCALL_STATS is not set # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set @@ -5738,6 +5739,7 @@ CONFIG_TEST_LIVEPATCH=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 5384c8088..88d260670 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1948,6 +1948,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDC2010=m @@ -6367,6 +6368,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ebf58f152..5e5c748cd 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -1695,6 +1695,7 @@ CONFIG_GVE=m CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5700,6 +5701,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 9902a1936..5b79a218a 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1931,6 +1931,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDC2010=m @@ -6341,6 +6342,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index e0f125392..bd49e3e2d 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1679,6 +1679,7 @@ CONFIG_GVE=m CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5680,6 +5681,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 38f6c111b..3675d0e03 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -1689,6 +1689,7 @@ CONFIG_GVE=m # CONFIG_HANGCHECK_TIMER is not set CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5707,6 +5708,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 6280d1a6e..34afe28c6 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -2121,6 +2121,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDC2010=m @@ -6787,6 +6788,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 0332adaf6..a2926a733 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1804,6 +1804,7 @@ CONFIG_HALTPOLL_CPUIDLE=y CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5938,6 +5939,7 @@ CONFIG_TEST_MIN_HEAP=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8440198d4..bc16ae04e 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2104,6 +2104,7 @@ CONFIG_HANGCHECK_TIMER=m CONFIG_HAPPYMEAL=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m CONFIG_HD44780=m # CONFIG_HDC100X is not set CONFIG_HDC2010=m @@ -6762,6 +6763,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 54e5ff0de..f6e6dbce5 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1788,6 +1788,7 @@ CONFIG_HALTPOLL_CPUIDLE=y CONFIG_HANGCHECK_TIMER=m CONFIG_HARDENED_USERCOPY=y CONFIG_HARDLOCKUP_DETECTOR=y +CONFIG_HASH_KUNIT_TEST=m # CONFIG_HD44780 is not set # CONFIG_HDC100X is not set # CONFIG_HDC2010 is not set @@ -5915,6 +5916,7 @@ CONFIG_TEST_LIVEPATCH=m # CONFIG_TEST_REF_TRACKER is not set # CONFIG_TEST_RHASHTABLE is not set # CONFIG_TEST_SCANF is not set +# CONFIG_TEST_SIPHASH is not set # CONFIG_TEST_SORT is not set # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set diff --git a/kernel.spec b/kernel.spec index 993367290..dd712bd67 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 0 -%global distro_build 0.rc0.20220119git1d1df41c5a33.70 +%global distro_build 0.rc0.20220120gitfa2e1ba3e9e3.71 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc0.20220119git1d1df41c5a33.70 +%define pkgrelease 0.rc0.20220120gitfa2e1ba3e9e3.71 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220119git1d1df41c5a33.70%{?buildid}%{?dist} +%define specrelease 0.rc0.20220120gitfa2e1ba3e9e3.71%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-11200-g1d1df41c5a33.tar.xz +Source0: linux-5.16-11358-gfa2e1ba3e9e3.tar.xz Source1: Makefile.rhelver @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-11200-g1d1df41c5a33 -c -mv linux-5.16-11200-g1d1df41c5a33 linux-%{KVERREL} +%setup -q -n kernel-5.16-11358-gfa2e1ba3e9e3 -c +mv linux-5.16-11358-gfa2e1ba3e9e3 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2986,6 +2986,9 @@ fi # # %changelog +* Thu Jan 20 2022 Fedora Kernel Team [5.17-0.rc0.20220120gitfa2e1ba3e9e3.71] +- Fixup merge in random.c (Justin M. Forbes) + * Wed Jan 19 2022 Fedora Kernel Team [5.17-0.rc0.20220118gitfe81ba137ebc.69] - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) - Add packaged but empty /lib/modules//systemtap/ (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 0cfc89cb2..d50ae2d44 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -17,7 +17,7 @@ drivers/ata/libahci.c | 18 ++ drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_msghandler.c | 16 +- - drivers/char/random.c | 134 ++++++++++ + drivers/char/random.c | 115 ++++++++ drivers/firmware/efi/Makefile | 1 + drivers/firmware/efi/efi.c | 124 ++++++--- drivers/firmware/efi/secureboot.c | 38 +++ @@ -72,7 +72,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 74 files changed, 1531 insertions(+), 188 deletions(-) + 74 files changed, 1512 insertions(+), 188 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index f5a27f067db9..f4dc42f2f82a 100644 @@ -174,7 +174,7 @@ index fabe39169b12..bfd2929ab514 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index f6e333b59314..32d8dcfa1e1d 100644 +index dc10d26cb432..b30c5a7659f5 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1024,7 +1024,7 @@ endchoice @@ -186,7 +186,7 @@ index f6e333b59314..32d8dcfa1e1d 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -@@ -1278,6 +1278,7 @@ config XEN +@@ -1266,6 +1266,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if ARM64_64K_PAGES @@ -655,7 +655,7 @@ index c59265146e9c..caa8458edde2 100644 rv = ipmi_register_driver(); mutex_unlock(&ipmi_interfaces_mutex); diff --git a/drivers/char/random.c b/drivers/char/random.c -index b411182df6f6..ec4b9e43cc65 100644 +index b411182df6f6..a113450d0521 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c @@ -344,6 +344,7 @@ @@ -666,7 +666,7 @@ index b411182df6f6..ec4b9e43cc65 100644 #include #include -@@ -358,6 +359,30 @@ +@@ -358,6 +359,11 @@ /* #define ADD_INTERRUPT_BENCH */ @@ -674,30 +674,11 @@ index b411182df6f6..ec4b9e43cc65 100644 + * Hook for external RNG. + */ +static const struct random_extrng __rcu *extrng; -+ -+/* -+ * Configuration information -+ */ -+#define INPUT_POOL_SHIFT 12 -+#define INPUT_POOL_WORDS (1 << (INPUT_POOL_SHIFT-5)) -+#define OUTPUT_POOL_SHIFT 10 -+#define OUTPUT_POOL_WORDS (1 << (OUTPUT_POOL_SHIFT-5)) -+#define EXTRACT_SIZE (BLAKE2S_HASH_SIZE / 2) -+ -+/* -+ * To allow fractional bits to be tracked, the entropy_count field is -+ * denominated in units of 1/8th bits. -+ * -+ * 2*(ENTROPY_SHIFT + poolbitshift) must <= 31, or the multiply in -+ * credit_entropy_bits() needs to be 64 bits wide. -+ */ -+#define ENTROPY_SHIFT 3 -+#define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT) + /* * If the entropy count falls under this number of bits, then we * should wake up processes which are selecting or polling on write -@@ -486,6 +511,9 @@ static int ratelimit_disable __read_mostly; +@@ -486,6 +492,9 @@ static int ratelimit_disable __read_mostly; module_param_named(ratelimit_disable, ratelimit_disable, int, 0644); MODULE_PARM_DESC(ratelimit_disable, "Disable random ratelimit suppression"); @@ -707,7 +688,7 @@ index b411182df6f6..ec4b9e43cc65 100644 /********************************************************************** * * OS independent entropy store. Here are the functions which handle -@@ -1775,6 +1803,13 @@ static __poll_t random_poll(struct file *file, poll_table *wait) +@@ -1775,6 +1784,13 @@ static __poll_t random_poll(struct file *file, poll_table *wait) return mask; } @@ -721,7 +702,7 @@ index b411182df6f6..ec4b9e43cc65 100644 static int write_pool(const char __user *buffer, size_t count) { size_t bytes; -@@ -1876,7 +1911,58 @@ static int random_fasync(int fd, struct file *filp, int on) +@@ -1876,7 +1892,58 @@ static int random_fasync(int fd, struct file *filp, int on) return fasync_helper(fd, filp, on, &fasync); } @@ -780,7 +761,7 @@ index b411182df6f6..ec4b9e43cc65 100644 .read = random_read, .write = random_write, .poll = random_poll, -@@ -1887,6 +1973,7 @@ const struct file_operations random_fops = { +@@ -1887,6 +1954,7 @@ const struct file_operations random_fops = { }; const struct file_operations urandom_fops = { @@ -788,7 +769,7 @@ index b411182df6f6..ec4b9e43cc65 100644 .read = urandom_read, .write = random_write, .unlocked_ioctl = random_ioctl, -@@ -1895,9 +1982,31 @@ const struct file_operations urandom_fops = { +@@ -1895,9 +1963,31 @@ const struct file_operations urandom_fops = { .llseek = noop_llseek, }; @@ -820,7 +801,7 @@ index b411182df6f6..ec4b9e43cc65 100644 int ret; if (flags & ~(GRND_NONBLOCK | GRND_RANDOM | GRND_INSECURE)) -@@ -1913,6 +2022,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, +@@ -1913,6 +2003,18 @@ SYSCALL_DEFINE3(getrandom, char __user *, buf, size_t, count, unsigned int, if (count > INT_MAX) count = INT_MAX; @@ -839,7 +820,7 @@ index b411182df6f6..ec4b9e43cc65 100644 if (!(flags & GRND_INSECURE) && !crng_ready()) { if (flags & GRND_NONBLOCK) return -EAGAIN; -@@ -2220,3 +2341,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) +@@ -2220,3 +2322,16 @@ void add_bootloader_randomness(const void *buf, unsigned int size) add_device_randomness(buf, size); } EXPORT_SYMBOL_GPL(add_bootloader_randomness); @@ -2224,10 +2205,10 @@ index ccd4d3f91c98..e64643e3e364 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index 055eb203c00e..023966c67190 100644 +index 33f47a996513..7a716c0b05bc 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -494,4 +494,23 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -503,4 +503,23 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) @@ -2816,10 +2797,10 @@ index 8723ae70ea1f..fb2d773498c2 100644 + return ret; } diff --git a/kernel/panic.c b/kernel/panic.c -index cefd7d82366f..ad43433c7013 100644 +index 55b50e052ec3..8b7955251793 100644 --- a/kernel/panic.c +++ b/kernel/panic.c -@@ -384,6 +384,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { +@@ -385,6 +385,20 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = { [ TAINT_LIVEPATCH ] = { 'K', ' ', true }, [ TAINT_AUX ] = { 'X', ' ', true }, [ TAINT_RANDSTRUCT ] = { 'T', ' ', true }, diff --git a/sources b/sources index 5c052c51e..5586debef 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.16-11200-g1d1df41c5a33.tar.xz) = 8ab47225ed863e7606d8ced78de60cc74521f30a232867b16120758a701490544ace33d1b466220bf147b260b2e679b5f668a88cb31cf8291f8045ad3711a293 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220119git1d1df41c5a33.70.tar.bz2) = 5ddc099152345576f60e9ecc28f3af9fb4bff34e35a64e802e2f42e7cc1d68c1c2b5e646a7255931cb303bb1c597beee8b8c3479ce1202623e74ab3d3569eb65 -SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220119git1d1df41c5a33.70.tar.bz2) = 9b7e9c3cb6fafd2a57e9fb2b84f7f61f24836da8b2a583878d68138130e530cfd30b454c6cb898c2ea9db330d7f05280938f3584a8f03545bc8aed2765908bde +SHA512 (linux-5.16-11358-gfa2e1ba3e9e3.tar.xz) = fcfa8b889916b1e009a195447f36cdb51ac75df0a5ed42b15863a5694241c6b28de01be67a404f3fc7c46fe5d63b1fc671bde0ea6dd9f57123d3f579bcaad1c4 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc0.20220120gitfa2e1ba3e9e3.71.tar.bz2) = a8ded5de4c5f94e38fb46edc0f7e16d62cb5cfc459916cc80f0a22efc5e365c549cdafd8ceb717170b48cbd644dac4b93c85c3ae84ca5c8cf9419e6a894bbd9a +SHA512 (kernel-kabi-dw-5.17.0-0.rc0.20220120gitfa2e1ba3e9e3.71.tar.bz2) = 053742e0a4246c097474679f4689c04cb0cfaf8eecfcfd8c6a77f39b42e785193b132d365c4bd4d26f7b5d73c453f6aceba15332df97b183b592ce810d3ba03e -- cgit