diff --git a/kernel.spec b/kernel.spec index 817ea7522..4608aa765 100644 --- a/kernel.spec +++ b/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.6.13 -%define specversion 6.6.13 +%define specrpmversion 6.6.14 +%define specversion 6.6.14 %define patchversion 6.6 %define pkgrelease 100 %define kversion 6 -%define tarfile_release 6.6.13 +%define tarfile_release 6.6.14 # This is needed to do merge window version magic %define patchlevel 6 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 100%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.6.13 +%define kabiversion 6.6.14 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3709,6 +3709,10 @@ fi\ # # %changelog +* Fri Jan 26 2024 Augusto Caringi [6.6.14-0] +- Add some CVE fixes staged for 6.6.14 (Justin M. Forbes) +- Linux v6.6.14 + * Sat Jan 20 2024 Justin M. Forbes [6.6.13-0] - Linux v6.6.13 diff --git a/patch-6.6-redhat.patch b/patch-6.6-redhat.patch index 869a273f1..79590949a 100644 --- a/patch-6.6-redhat.patch +++ b/patch-6.6-redhat.patch @@ -44,7 +44,7 @@ 43 files changed, 1132 insertions(+), 241 deletions(-) diff --git a/Makefile b/Makefile -index a4a2932a4318..e8e5f121c0b9 100644 +index bad16eda67e2..cfd8719528dd 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -2224,10 +2224,10 @@ index f170aec967c1..bbd6f0ed16c1 100644 void (*playback_hook)(struct device *dev, int action); void (*post_playback_hook)(struct device *dev, int action); diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c -index 576e0f265abd..ce45c1a10150 100644 +index 375569d0864b..cfe4a3b588dd 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c -@@ -9871,22 +9871,28 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -9873,22 +9873,28 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), @@ -2265,7 +2265,7 @@ index 576e0f265abd..ce45c1a10150 100644 SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS), SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x18d3, "ASUS UM3504DA", ALC294_FIXUP_CS35L41_I2C_2), -@@ -9911,10 +9917,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -9913,10 +9919,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1c43, "ASUS UX8406MA", ALC245_FIXUP_CS35L41_SPI_2), SND_PCI_QUIRK(0x1043, 0x1c62, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS), @@ -2282,7 +2282,7 @@ index 576e0f265abd..ce45c1a10150 100644 SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), SND_PCI_QUIRK(0x1043, 0x1da2, "ASUS UP6502ZA/ZD", ALC245_FIXUP_CS35L41_SPI_2), -@@ -9930,6 +9939,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { +@@ -9932,6 +9941,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1f12, "ASUS UM5302", ALC287_FIXUP_CS35L41_I2C_2), diff --git a/sources b/sources index e2b343d30..c4588c2e8 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = ea72bdfb5065f430c0b7076ba49f8fbc1b16f861dc4182f1ee5bc8a809f8f3103d97766e5719354f8163a77235a759a65cc7d4efc66e314dcc658ceda6a77016 SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a -SHA512 (linux-6.6.13.tar.xz) = 9ff371452d7373e12f76ea56e890c08450f51581884f832146abb5cd441a9b1e3169827706a9ecac6506c5ec71414bf754e61ec3413e7a219a46a63a1a777a72 -SHA512 (kernel-abi-stablelists-6.6.13.tar.xz) = 48da39c00aca7533f232d654629eff24061c89c90f01154d841c94d1558dac2ea133e005e9d35a772e7b6f08f10380bee9137aaf05488fd5742556f45988334d -SHA512 (kernel-kabi-dw-6.6.13.tar.xz) = 0280068211794be6649251eaf93551f618adc1b108e2be526e0601d94602cd243d2fda50754cf3c84cc012b7ce2f7815ecb9266dbbfe533980d31b35c1ef8fdc +SHA512 (linux-6.6.14.tar.xz) = ce77cfab2ecb70016176f3b06e4658ab525852d63ee1b2bd568563a4506fa727a720bc3ed0acc500e3493ecd16a7107c08f99d48e8a36699f37a385bf6cf55c1 +SHA512 (kernel-abi-stablelists-6.6.14.tar.xz) = 66f575cdfda8a67fee696005218db0a143f2e13b89f6e0e18e21bb3c74992739f7bfaa3497bedc10f0856b4a26d88e15ce2b96a4e39d96371c2cdc5ec15805dd +SHA512 (kernel-kabi-dw-6.6.14.tar.xz) = 3db3d065f110ce8cdb34011363716badbf9245e6538ba263f8686ffde0024cd83724035290c6d1d94e56064e499c15b392e920683782625d4352a1fe84c11e40