From 5ff17644e3967601fff6f4a300632fc2fb37c007 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 18 Feb 2022 11:41:08 -0600 Subject: kernel-5.17-0.rc4.9195e5e0adbb.100 * Fri Feb 18 2022 Fedora Kernel Team [5.17-0.rc4.9195e5e0adbb.100] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 7 ++----- kernel-aarch64-debug-rhel.config | 7 +------ kernel-aarch64-rhel.config | 7 +------ kernel-ppc64le-debug-rhel.config | 7 +------ kernel-ppc64le-rhel.config | 7 +------ kernel-s390x-debug-rhel.config | 7 +------ kernel-s390x-rhel.config | 7 +------ kernel-s390x-zfcpdump-rhel.config | 7 +------ kernel-x86_64-debug-rhel.config | 7 +------ kernel-x86_64-rhel.config | 7 +------ kernel.spec | 18 ++++++++++-------- patch-5.17-redhat.patch | 25 +------------------------ sources | 6 +++--- 14 files changed, 26 insertions(+), 95 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index d22c9ad34..623169e60 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 = 99 +RHEL_RELEASE = 100 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index a0b8391cb..e20f64f19 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/2698d7b1ae8060e6a86ba4e85434b6ae669ddc27 - 2698d7b1ae8060e6a86ba4e85434b6ae669ddc27 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning - -https://gitlab.com/cki-project/kernel-ark/-/commit/77fe66f6a3104d32911aab0736ec2ff9cee77ea2 - 77fe66f6a3104d32911aab0736ec2ff9cee77ea2 tools: Fix use-after-free for realloc(..., 0) +https://gitlab.com/cki-project/kernel-ark/-/commit/2a5b4cb01ce15645555568d370741862f00eb28e + 2a5b4cb01ce15645555568d370741862f00eb28e mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 618e66853..a10e8321c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3599,12 +3599,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 44f592978..62b3daea6 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3578,12 +3578,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 9f39a2f8b..a6de43655 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3414,12 +3414,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index b45968c6d..207070e3e 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3396,12 +3396,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 5f37d1db0..c8355966e 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3396,12 +3396,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 45e2f84eb..255083100 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3378,12 +3378,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3bd87b815..4d98bc5ae 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3393,12 +3393,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 87a7cff84..bf15e221b 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3591,12 +3591,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index f037389dc..908862f7e 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3571,12 +3571,7 @@ CONFIG_NET_SCH_TBF=m # CONFIG_NET_SCH_TEQL is not set CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y -CONFIG_NET_TEAM=m -CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m -CONFIG_NET_TEAM_MODE_BROADCAST=m -CONFIG_NET_TEAM_MODE_LOADBALANCE=m -CONFIG_NET_TEAM_MODE_RANDOM=m -CONFIG_NET_TEAM_MODE_ROUNDROBIN=m +# CONFIG_NET_TEAM is not set # CONFIG_NET_TULIP is not set CONFIG_NET_UDP_TUNNEL=m # CONFIG_NET_VENDOR_3COM is not set diff --git a/kernel.spec b/kernel.spec index 36918b4c1..fc7aaabe1 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.rc4.20220217gitf71077a4d84b.99 +%global distro_build 0.rc4.20220218git9195e5e0adbb.100 %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.rc4.20220217gitf71077a4d84b.99 +%define pkgrelease 0.rc4.20220218git9195e5e0adbb.100 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220217gitf71077a4d84b.99%{?buildid}%{?dist} +%define specrelease 0.rc4.20220218git9195e5e0adbb.100%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -695,7 +695,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc4-54-gf71077a4d84b.tar.xz +Source0: linux-5.17-rc4-162-g9195e5e0adbb.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc4-54-gf71077a4d84b -c -mv linux-5.17-rc4-54-gf71077a4d84b linux-%{KVERREL} +%setup -q -n kernel-5.17-rc4-162-g9195e5e0adbb -c +mv linux-5.17-rc4-162-g9195e5e0adbb linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,9 +3005,11 @@ fi # # %changelog -* Thu Feb 17 2022 Fedora Kernel Team [5.17-0.rc4.f71077a4d84b.99] +* Fri Feb 18 2022 Fedora Kernel Team [5.17-0.rc4.9195e5e0adbb.100] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) -- tools: Fix use-after-free for realloc(..., 0) (Kees Cook) + +* Fri Feb 18 2022 Fedora Kernel Team [5.17-0.rc4.9195e5e0adbb.99] +- redhat: configs: Disable team driver (Hangbin Liu) [1945477] * Thu Feb 17 2022 Fedora Kernel Team [5.17-0.rc4.f71077a4d84b.98] - configs: enable LOGITECH_FF for RHEL/CentOS too (Benjamin Tissoires) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 9de2761b4..cd6165578 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -74,8 +74,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - tools/lib/subcmd/subcmd-util.h | 11 +- - 77 files changed, 1746 insertions(+), 200 deletions(-) + 76 files changed, 1744 insertions(+), 191 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index f5a27f067db9..f4dc42f2f82a 100644 @@ -3435,25 +3434,3 @@ index 22261d79f333..20336365f864 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { -diff --git a/tools/lib/subcmd/subcmd-util.h b/tools/lib/subcmd/subcmd-util.h -index 794a375dad36..b2aec04fce8f 100644 ---- a/tools/lib/subcmd/subcmd-util.h -+++ b/tools/lib/subcmd/subcmd-util.h -@@ -50,15 +50,8 @@ static NORETURN inline void die(const char *err, ...) - static inline void *xrealloc(void *ptr, size_t size) - { - void *ret = realloc(ptr, size); -- if (!ret && !size) -- ret = realloc(ptr, 1); -- if (!ret) { -- ret = realloc(ptr, size); -- if (!ret && !size) -- ret = realloc(ptr, 1); -- if (!ret) -- die("Out of memory, realloc failed"); -- } -+ if (!ret) -+ die("Out of memory, realloc failed"); - return ret; - } - diff --git a/sources b/sources index ca7e58b8f..14c7fd056 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc4-54-gf71077a4d84b.tar.xz) = a6da6afd403e714e25a08a46d314bc7cdd47a7988bf4da3cb103575f98c5eddeeb24d95afaaec959aff7356947c1e09102079395a2e9d2dedea9ab8330ff0ca6 -SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.20220217gitf71077a4d84b.99.tar.bz2) = d36ab7ece3945e4b8e55e259731352557bf65f8c527295e92a88a9dd39fca0510014140d5ed699c3c26ec88822e69118b84496773926651022130c207e32735b -SHA512 (kernel-kabi-dw-5.17.0-0.rc4.20220217gitf71077a4d84b.99.tar.bz2) = be0f1aae2831bff849412fca349ef153cfc8364a15f311f777b676d520303ea7b6fe4aafeb4cd41e3b6691415bc239cf72defdd2ebbbbc1980b86cafbb6a7b4a +SHA512 (linux-5.17-rc4-162-g9195e5e0adbb.tar.xz) = db1447e3428c1b7a82b4aeb908ce2e8fa44eec3de0e20fc503d40d5595633000c6464a6a2069ab4eb4f82957583d84b7d98fbfe303be90ede6c33ae5b6dab8e8 +SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.20220218git9195e5e0adbb.100.tar.bz2) = 4afa0263bdb70fd849f206cf9d822547074f0ad9e601156bcecb2c2be286e7123222bcca534eb1e0812396bf4c11124191c3e39218e9fcb22de1767afe808ee8 +SHA512 (kernel-kabi-dw-5.17.0-0.rc4.20220218git9195e5e0adbb.100.tar.bz2) = b0e55eb761b5a54f601ad44de05b51b78bb2555235e893458c2843ced3a862a9dc45ca79c55349a348d8f16bc9889e3cbefbecead507c7f2f7583a919ddae3d2 -- cgit