From d52b2f38e1f68bbd00510e37f9fd79164f380bf8 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 19 May 2025 18:18:07 -0600 Subject: [PATCH] kernel-6.14.7-201 * Sun May 18 2025 Justin M. Forbes [6.14.7-0] - Turn on MITIGATION_ITS for RHEL configs (Justin M. Forbes) - Add bug to Bugsfixed for 6.14.7 (Justin M. Forbes) - powerpc/bpf: fix JIT code size calculation of bpf trampoline (Hari Bathini) - Set MITIGATION_ITS for Fedora (Justin M. Forbes) - Fedora 40 is EOL (Justin M. Forbes) - Linux v6.14.7 Resolves: Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 8 +++++-- patch-6.14-redhat.patch | 51 ++++++++++++++++++++++++++++++++++++++++- sources | 4 ++-- 4 files changed, 61 insertions(+), 5 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 8273c7abf..491af90cc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/b58d3f80cb10dac25b2503f2a537e96dd2457218 + b58d3f80cb10dac25b2503f2a537e96dd2457218 Revert "loop: Add sanity check for read/write_iter" + https://gitlab.com/cki-project/kernel-ark/-/commit/6f21234ca80186c3ac2dba318fa458f967c6f677 6f21234ca80186c3ac2dba318fa458f967c6f677 powerpc/bpf: fix JIT code size calculation of bpf trampoline diff --git a/kernel.spec b/kernel.spec index 43f33627c..0a6a047a6 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,13 +162,13 @@ Summary: The Linux kernel %define specrpmversion 6.14.7 %define specversion 6.14.7 %define patchversion 6.14 -%define pkgrelease 200 +%define pkgrelease 201 %define kversion 6 %define tarfile_release 6.14.7 # This is needed to do merge window version magic %define patchlevel 14 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 200%{?buildid}%{?dist} +%define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.14.7 @@ -4205,6 +4205,10 @@ fi\ # # %changelog +* Mon May 19 2025 Justin M. Forbes [6.14.7-201] +- Revert "loop: Add sanity check for read/write_iter" (Justin M. Forbes) +- Fix up typo in release_targets (Justin M. Forbes) + * Sun May 18 2025 Justin M. Forbes [6.14.7-0] - Turn on MITIGATION_ITS for RHEL configs (Justin M. Forbes) - Add bug to Bugsfixed for 6.14.7 (Justin M. Forbes) diff --git a/patch-6.14-redhat.patch b/patch-6.14-redhat.patch index 9fc79b50d..7fa442dee 100644 --- a/patch-6.14-redhat.patch +++ b/patch-6.14-redhat.patch @@ -25,6 +25,7 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 + drivers/ata/libahci.c | 18 + + drivers/block/loop.c | 23 - drivers/char/ipmi/ipmi_dmi.c | 15 + drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + @@ -68,7 +69,7 @@ security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 11 + - 70 files changed, 3097 insertions(+), 659 deletions(-) + 71 files changed, 3097 insertions(+), 682 deletions(-) diff --git a/Documentation/ABI/testing/sysfs-kernel-fadump b/Documentation/ABI/testing/sysfs-kernel-fadump index 2f9daa7ca55b..b64b7622e6fc 100644 @@ -843,6 +844,54 @@ index 22afa4ff860d..78eacccaa1ae 100644 /* wait for engine to stop. This could be as long as 500 msec */ tmp = ata_wait_register(ap, port_mmio + PORT_CMD, PORT_CMD_LIST_ON, PORT_CMD_LIST_ON, 1, 500); +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index b378d2aa49f0..61ce7ccde344 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -504,17 +504,6 @@ static void loop_assign_backing_file(struct loop_device *lo, struct file *file) + lo->old_gfp_mask & ~(__GFP_IO | __GFP_FS)); + } + +-static int loop_check_backing_file(struct file *file) +-{ +- if (!file->f_op->read_iter) +- return -EINVAL; +- +- if ((file->f_mode & FMODE_WRITE) && !file->f_op->write_iter) +- return -EINVAL; +- +- return 0; +-} +- + /* + * loop_change_fd switched the backing store of a loopback device to + * a new file. This is useful for operating system installers to free up +@@ -536,10 +525,6 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + if (!file) + return -EBADF; + +- error = loop_check_backing_file(file); +- if (error) +- return error; +- + /* suppress uevents while reconfiguring the device */ + dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 1); + +@@ -971,14 +956,6 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, + + if (!file) + return -EBADF; +- +- if ((mode & BLK_OPEN_WRITE) && !file->f_op->write_iter) +- return -EINVAL; +- +- error = loop_check_backing_file(file); +- if (error) +- return error; +- + is_loop = is_loop_device(file); + + /* This is safe, since we have a reference from open(). */ diff --git a/drivers/char/ipmi/ipmi_dmi.c b/drivers/char/ipmi/ipmi_dmi.c index bbf7029e224b..cf7faa970dd6 100644 --- a/drivers/char/ipmi/ipmi_dmi.c diff --git a/sources b/sources index a1510a148..8dcb12f76 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-6.14.7.tar.xz) = 767421666bdc34f4cdc3f010e4e22a038b3588597ad2027988ebabad4c1b683e4c86fd6e54380f6befd61e4350884442299fe1522adbe93a72a3f05cd2cb9a85 -SHA512 (kernel-abi-stablelists-6.14.7.tar.xz) = ab0ec64e56f039ea239e2633640f6b9a486d1194ce8818bf712d75480c1f3893d430133a794796b3a6ce73fd6af3a5949a479d2d702de374d1e628c9e9698b0b -SHA512 (kernel-kabi-dw-6.14.7.tar.xz) = 100d98de68e44dae21026f596cda45611556515bda998bd53572a7bea9ff1c616a9aa8d189498bece04fc4d3c594bbf9ef3b5fa0b7bc840ef3bd97fe2b8eb0d3 +SHA512 (kernel-abi-stablelists-6.14.7.tar.xz) = 4430d6e046f8005ce1880f8965f97074c93f9dfce4bd7ec286eb9cba86b78e5b6f7669c41f1f58bfc0620bb4d06a7022e4f10cd0d2ade89a38105be41c7a375a +SHA512 (kernel-kabi-dw-6.14.7.tar.xz) = a3f97551e75d4db323c9abac98601374be7577e8a02e5d09244a1e58c73a3c16259dc69ebdd3f1b8e5e65f58b712e123864a7df4c26abcd1aed98b09605b7993