From 0a6fd1833138331a6b9007e65f344a2fcb1a59f4 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 15 Feb 2022 06:53:51 -0600 Subject: [PATCH] kernel-5.17-0.rc4.d567f5db412e.97 * Tue Feb 15 2022 Fedora Kernel Team [5.17-0.rc4.d567f5db412e.97] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) - tools: Fix use-after-free for realloc(..., 0) (Kees Cook) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 8 ++++---- kernel.spec | 18 +++++++++--------- patch-5.17-redhat.patch | 30 +++++++++++++++--------------- sources | 6 +++--- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 03d9cace9..447991227 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 = 96 +RHEL_RELEASE = 97 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index aa343a35f..deffe5273 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/741f03d77ad0fe53cea44d1ea62fbc9bf48c4535 - 741f03d77ad0fe53cea44d1ea62fbc9bf48c4535 mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning +https://gitlab.com/cki-project/kernel-ark/-/commit/9bd25eb01729860701ec902abfcc4730f3752e3b + 9bd25eb01729860701ec902abfcc4730f3752e3b mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning -https://gitlab.com/cki-project/kernel-ark/-/commit/6be3e36905dbb2e7a8a23d04af180e5e9e0fd8b2 - 6be3e36905dbb2e7a8a23d04af180e5e9e0fd8b2 Workaround for gcc12 compile issues in ubcmd-util.h +https://gitlab.com/cki-project/kernel-ark/-/commit/49cb0e447d9dce2bed07776a2d0259a9ea5a609b + 49cb0e447d9dce2bed07776a2d0259a9ea5a609b tools: Fix use-after-free for realloc(..., 0) https://gitlab.com/cki-project/kernel-ark/-/commit/4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b 4f79b3c547b8e3dbc014058a8adffe0fe8cd5e4b objtool: check: give big enough buffer for pv_ops diff --git a/kernel.spec b/kernel.spec index e35db47b6..3eeb13388 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc4.96 +%global distro_build 0.rc4.20220215gitd567f5db412e.97 %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.96 +%define pkgrelease 0.rc4.20220215gitd567f5db412e.97 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.96%{?buildid}%{?dist} +%define specrelease 0.rc4.20220215gitd567f5db412e.97%{?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.tar.xz +Source0: linux-5.17-rc4-2-gd567f5db412e.tar.xz Source1: Makefile.rhelver @@ -1391,8 +1391,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc4 -c -mv linux-5.17-rc4 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc4-2-gd567f5db412e -c +mv linux-5.17-rc4-2-gd567f5db412e linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3005,9 +3005,9 @@ fi # # %changelog -* Mon Feb 14 2022 Fedora Kernel Team [5.17-0.rc4.96] +* Tue Feb 15 2022 Fedora Kernel Team [5.17-0.rc4.d567f5db412e.97] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) -- Workaround for gcc12 compile issues in ubcmd-util.h (Justin M. Forbes) +- tools: Fix use-after-free for realloc(..., 0) (Kees Cook) * Sun Feb 13 2022 Fedora Kernel Team [5.17-0.rc3.b81b1829e7e3.94] - redhat: fix make {distg-brew,distg-koji} (Andrea Claudi) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index c7be88cf8..9de2761b4 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -74,8 +74,8 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - tools/lib/subcmd/subcmd-util.h | 9 +- - 77 files changed, 1748 insertions(+), 196 deletions(-) + tools/lib/subcmd/subcmd-util.h | 11 +- + 77 files changed, 1746 insertions(+), 200 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index f5a27f067db9..f4dc42f2f82a 100644 @@ -3436,24 +3436,24 @@ index 22261d79f333..20336365f864 100644 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..7009fc176636 100644 +index 794a375dad36..b2aec04fce8f 100644 --- a/tools/lib/subcmd/subcmd-util.h +++ b/tools/lib/subcmd/subcmd-util.h -@@ -49,13 +49,12 @@ static NORETURN inline void die(const char *err, ...) - +@@ -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); + void *ret = realloc(ptr, size); - if (!ret && !size) - ret = realloc(ptr, 1); -+ void *ret; -+ if (!size) -+ size = 1; -+ ret = realloc(ptr, size); - if (!ret) { - ret = realloc(ptr, size); +- 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"); +- } ++ if (!ret) ++ die("Out of memory, realloc failed"); + return ret; + } + diff --git a/sources b/sources index 55160a963..06da1674b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.17-rc4.tar.xz) = 68a2de9e99718c6f55d2cb17d774bb13adeb37a3b3dc5c4e9c23c8055c235ed7fa4456f3f9534a97485a9422120e473dd003f7036bbd4d031456d06f7837379e -SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.96.tar.bz2) = 7a7a6065902e2431774842daae8b9127d4ee66872ec809925dd7976b3f7ccecc7b9bc06c86426fdbe8fa0ac08ba6bc6087fbb0acec9e08849762df462b43e1ef -SHA512 (kernel-kabi-dw-5.17.0-0.rc4.96.tar.bz2) = 89bbdca28bfd8e1b96a000d12be1acd31e0bcecac5662798bfc2ab65d2140563b33a741aacbf6ef0f97ff9a45fabb50ea937312d3e66eb3c9b7f41aa28dd2bf9 +SHA512 (linux-5.17-rc4-2-gd567f5db412e.tar.xz) = e54c8a0c18d15c8a5de792549a70407b112477eb2173f811f537f0420dbecbe8cbc2c53b77ee12748468fa6cc374038f01cffe01d5150886f9603672ebd2e5ae +SHA512 (kernel-abi-stablelists-5.17.0-0.rc4.20220215gitd567f5db412e.97.tar.bz2) = 3327259204bd1099a56d74af4020d27e6c13fc616f0689a69b2c597c48b75dc619bf6dd32f1891e7fef2a62c459d1529ef88fc4ef5cf1675922cd3984cddb3f6 +SHA512 (kernel-kabi-dw-5.17.0-0.rc4.20220215gitd567f5db412e.97.tar.bz2) = 36d89a9d1571016231c42b0df46d6d7aa38c2e3e32f0200d9a89f543a81b1b682d55511448d187139d8704160143da05f06a9ac3d66285d4900898552dd96ee2