kernel-6.5.2-300
* Wed Sep 06 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.5.2-0] - Move squashfs to kernel-modules-core (Justin M. Forbes) - Add TPM bug to BugsFixed (Justin M. Forbes) - tpm: Enable hwrng only for Pluton on AMD CPUs (Jarkko Sakkinen) - Linux v6.5.2 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes
parent
83c3cc9c12
commit
378cd8fe48
|
|
@ -1,3 +1,6 @@
|
|||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b
|
||||
c53302b2ed77cf6f3a125135a1f85af8cbc0ba4b tpm: Enable hwrng only for Pluton on AMD CPUs
|
||||
|
||||
"https://gitlab.com/cki-project/kernel-ark/-/commit"/065cd69d44a8c576d6ff671ceae019f991cee492
|
||||
065cd69d44a8c576d6ff671ceae019f991cee492 erofs: ensure that the post-EOF tails are all zeroed
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ scsidrvs="aacraid aic7xxx be2iscsi bfa bnx2i bnx2fc csiostor cxgbi esas2r fcoe f
|
|||
|
||||
usbdrvs="atm image misc serial"
|
||||
|
||||
fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix nilfs2 ocfs2 reiserfs romfs squashfs sysv ubifs ufs"
|
||||
fsdrvs="affs befs coda cramfs dlm ecryptfs hfs hfsplus jfs jffs2 minix nilfs2 ocfs2 reiserfs romfs sysv ubifs ufs"
|
||||
|
||||
netprots="6lowpan appletalk atm ax25 batman-adv bluetooth can dsa ieee802154 l2tp mac80211 mac802154 mpls netrom nfc rds rfkill rose sctp smc wireless"
|
||||
|
||||
|
|
|
|||
14
kernel.spec
14
kernel.spec
|
|
@ -160,18 +160,18 @@ Summary: The Linux kernel
|
|||
# the --with-release option overrides this setting.)
|
||||
%define debugbuildsenabled 1
|
||||
# define buildid .local
|
||||
%define specrpmversion 6.5.1
|
||||
%define specversion 6.5.1
|
||||
%define specrpmversion 6.5.2
|
||||
%define specversion 6.5.2
|
||||
%define patchversion 6.5
|
||||
%define pkgrelease 300
|
||||
%define kversion 6
|
||||
%define tarfile_release 6.5.1
|
||||
%define tarfile_release 6.5.2
|
||||
# This is needed to do merge window version magic
|
||||
%define patchlevel 5
|
||||
# This allows pkg_release to have configurable %%{?dist} tag
|
||||
%define specrelease 300%{?buildid}%{?dist}
|
||||
# This defines the kabi tarball version
|
||||
%define kabiversion 6.5.1
|
||||
%define kabiversion 6.5.2
|
||||
|
||||
# If this variable is set to 1, a bpf selftests build failure will cause a
|
||||
# fatal kernel package build error
|
||||
|
|
@ -3702,6 +3702,12 @@ fi\
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Wed Sep 06 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.5.2-0]
|
||||
- Move squashfs to kernel-modules-core (Justin M. Forbes)
|
||||
- Add TPM bug to BugsFixed (Justin M. Forbes)
|
||||
- tpm: Enable hwrng only for Pluton on AMD CPUs (Jarkko Sakkinen)
|
||||
- Linux v6.5.2
|
||||
|
||||
* Sat Sep 02 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.5.1-0]
|
||||
- erofs: ensure that the post-EOF tails are all zeroed (Gao Xiang)
|
||||
- Add bug to BugsFixed (Justin M. Forbes)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
drivers/ata/libahci.c | 18 +++
|
||||
drivers/char/ipmi/ipmi_dmi.c | 15 +++
|
||||
drivers/char/ipmi/ipmi_msghandler.c | 16 ++-
|
||||
drivers/char/tpm/tpm_crb.c | 33 ++----
|
||||
drivers/firmware/efi/Makefile | 1 +
|
||||
drivers/firmware/efi/efi.c | 124 +++++++++++++++------
|
||||
drivers/firmware/efi/secureboot.c | 38 +++++++
|
||||
|
|
@ -24,7 +25,6 @@
|
|||
drivers/pci/quirks.c | 24 ++++
|
||||
drivers/scsi/sd.c | 10 ++
|
||||
drivers/usb/core/hub.c | 7 ++
|
||||
fs/erofs/zdata.c | 2 +
|
||||
include/linux/efi.h | 22 ++--
|
||||
include/linux/lsm_hook_defs.h | 2 +
|
||||
include/linux/rmi.h | 1 +
|
||||
|
|
@ -35,10 +35,10 @@
|
|||
security/lockdown/Kconfig | 13 +++
|
||||
security/lockdown/lockdown.c | 1 +
|
||||
security/security.c | 12 ++
|
||||
37 files changed, 517 insertions(+), 185 deletions(-)
|
||||
37 files changed, 523 insertions(+), 210 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 062b9694e054..3266e61f4cdc 100644
|
||||
index c47558bc00aa..ed7450da2c78 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||
|
|
@ -326,6 +326,57 @@ index 186f1fee7534..93e3a76596ff 100644
|
|||
mutex_lock(&ipmi_interfaces_mutex);
|
||||
rv = ipmi_register_driver();
|
||||
mutex_unlock(&ipmi_interfaces_mutex);
|
||||
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c
|
||||
index 9eb1a1859012..a5dbebb1acfc 100644
|
||||
--- a/drivers/char/tpm/tpm_crb.c
|
||||
+++ b/drivers/char/tpm/tpm_crb.c
|
||||
@@ -463,28 +463,6 @@ static bool crb_req_canceled(struct tpm_chip *chip, u8 status)
|
||||
return (cancel & CRB_CANCEL_INVOKE) == CRB_CANCEL_INVOKE;
|
||||
}
|
||||
|
||||
-static int crb_check_flags(struct tpm_chip *chip)
|
||||
-{
|
||||
- u32 val;
|
||||
- int ret;
|
||||
-
|
||||
- ret = crb_request_locality(chip, 0);
|
||||
- if (ret)
|
||||
- return ret;
|
||||
-
|
||||
- ret = tpm2_get_tpm_pt(chip, TPM2_PT_MANUFACTURER, &val, NULL);
|
||||
- if (ret)
|
||||
- goto release;
|
||||
-
|
||||
- if (val == 0x414D4400U /* AMD */)
|
||||
- chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED;
|
||||
-
|
||||
-release:
|
||||
- crb_relinquish_locality(chip, 0);
|
||||
-
|
||||
- return ret;
|
||||
-}
|
||||
-
|
||||
static const struct tpm_class_ops tpm_crb = {
|
||||
.flags = TPM_OPS_AUTO_STARTUP,
|
||||
.status = crb_status,
|
||||
@@ -826,9 +804,14 @@ static int crb_acpi_add(struct acpi_device *device)
|
||||
if (rc)
|
||||
goto out;
|
||||
|
||||
- rc = crb_check_flags(chip);
|
||||
- if (rc)
|
||||
- goto out;
|
||||
+#ifdef CONFIG_X86
|
||||
+ /* A quirk for https://www.amd.com/en/support/kb/faq/pa-410 */
|
||||
+ if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD &&
|
||||
+ priv->sm != ACPI_TPM2_COMMAND_BUFFER_WITH_PLUTON) {
|
||||
+ dev_info(dev, "Disabling hwrng\n");
|
||||
+ chip->flags |= TPM_CHIP_FLAG_HWRNG_DISABLED;
|
||||
+ }
|
||||
+#endif /* CONFIG_X86 */
|
||||
|
||||
rc = tpm_chip_register(chip);
|
||||
|
||||
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
|
||||
index e489fefd23da..f2dfae764fb5 100644
|
||||
--- a/drivers/firmware/efi/Makefile
|
||||
|
|
@ -1178,19 +1229,6 @@ index a739403a9e45..191513936ce8 100644
|
|||
/* Lock the device, then check to see if we were
|
||||
* disconnected while waiting for the lock to succeed. */
|
||||
usb_lock_device(hdev);
|
||||
diff --git a/fs/erofs/zdata.c b/fs/erofs/zdata.c
|
||||
index de4f12152b62..9c9350eb1704 100644
|
||||
--- a/fs/erofs/zdata.c
|
||||
+++ b/fs/erofs/zdata.c
|
||||
@@ -1038,6 +1038,8 @@ static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
|
||||
cur = end - min_t(erofs_off_t, offset + end - map->m_la, end);
|
||||
if (!(map->m_flags & EROFS_MAP_MAPPED)) {
|
||||
zero_user_segment(page, cur, end);
|
||||
+ ++spiltted;
|
||||
+ tight = false;
|
||||
goto next_part;
|
||||
}
|
||||
if (map->m_flags & EROFS_MAP_FRAGMENT) {
|
||||
diff --git a/include/linux/efi.h b/include/linux/efi.h
|
||||
index ab088c662e88..f974f9d9a7c5 100644
|
||||
--- a/include/linux/efi.h
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -1,3 +1,3 @@
|
|||
SHA512 (linux-6.5.1.tar.xz) = 309014ae71faba4f3ddcbe2a2e2cd2743b736adfb60337c178be378cb6d2f76ceb8f76bfb43a637b68333e90e539d8d7c82138d171e0d33f8801a589488f7ff5
|
||||
SHA512 (kernel-abi-stablelists-6.5.1.tar.bz2) = bf13f55357254bc6636dd7f99be09d9d0e44cca5e284a7383646ab87084d0820fb02cf787550616b340061ad3bf4a784e5b41ee06f3cc5b6f13b18e708fa93a8
|
||||
SHA512 (kernel-kabi-dw-6.5.1.tar.bz2) = 41bd38fb7555f325409db757ed124ec51e1ebaf3aaf6500f944e242e52bfc026398d0316bdbde523bdb4d525b51d1631fc97038e228152459aee384a5e80a81e
|
||||
SHA512 (linux-6.5.2.tar.xz) = 9aaf88d58a27576e7ce8378480718f44f140511494bb1ef6872521c94536f798d7b2adc5070f2686872cc0ea14b5412750bfaa31fb760db68901f351fd802321
|
||||
SHA512 (kernel-abi-stablelists-6.5.2.tar.bz2) = 49538acf1c4bca15e6ab2ccf497c5dca5e90a725f50273e37db94c74c74c9158933d0a597c6fb13e6b74d88e62f162659a29f1b44ab615b844b784af5e1aa94b
|
||||
SHA512 (kernel-kabi-dw-6.5.2.tar.bz2) = e5b298f0acf22d64af510e847b43b734b35ad45494ec5579272a760f7d799d324f5965b0a2b2f1a003567e971da5058b767a155e820085f1ce809980e6c34a35
|
||||
|
|
|
|||
Loading…
Reference in New Issue