diff options
Diffstat (limited to 'SOURCES')
-rw-r--r-- | SOURCES/Patchlist.changelog | 7 | ||||
-rw-r--r-- | SOURCES/kernel.changelog | 13 | ||||
-rw-r--r-- | SOURCES/linux-surface.patch | 78 | ||||
-rw-r--r-- | SOURCES/patch-6.8-redhat.patch | 72 | ||||
-rw-r--r-- | SOURCES/t2linux.patch | 107 |
5 files changed, 70 insertions, 207 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index 051200b..0f61300 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,5 +1,8 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/c7fb6711c80096b45afa7c974abfc5bee31eb1a3 - c7fb6711c80096b45afa7c974abfc5bee31eb1a3 Revert "cpupower: Bump soname version" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/83dae02150c829b67e0f34ac7b2988030be53b0c + 83dae02150c829b67e0f34ac7b2988030be53b0c Revert "cpupower: Bump soname version" + +"https://gitlab.com/cki-project/kernel-ark/-/commit"/9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 + 9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" "https://gitlab.com/cki-project/kernel-ark/-/commit"/fccd579ad79c032dd402f674fd94e80ad52519f6 fccd579ad79c032dd402f674fd94e80ad52519f6 xfs: fix SEEK_HOLE/DATA for regions with active COW extents diff --git a/SOURCES/kernel.changelog b/SOURCES/kernel.changelog index 639a94e..46d12cc 100644 --- a/SOURCES/kernel.changelog +++ b/SOURCES/kernel.changelog @@ -1,3 +1,16 @@ +* Thu Apr 04 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.8.4-0] +- Linux v6.8.4 +Resolves: + +* Wed Apr 03 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.8.3-0] +- Fix up redhat directory for stable reabses (Justin M. Forbes) +- Add some CVE fixes for 6.8.3 (Justin M. Forbes) +- Add bug to BugsFixed (Justin M. Forbes) +- Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" (Johan Hovold) +- Config updates for stable (Justin M. Forbes) +- Linux v6.8.3 +Resolves: + * Tue Mar 26 2024 Justin M. Forbes <jforbes@fedoraproject.org> [6.8.2-0] - xfs: fix SEEK_HOLE/DATA for regions with active COW extents (Dave Chinner) - redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) diff --git a/SOURCES/linux-surface.patch b/SOURCES/linux-surface.patch index 1a80ad4..ac7daa5 100644 --- a/SOURCES/linux-surface.patch +++ b/SOURCES/linux-surface.patch @@ -8748,84 +8748,6 @@ index 000000000000..35aeb5db89c8 -- 2.44.0 -From b7e66758c1bd493c7140c17d0f00f727f8fefb32 Mon Sep 17 00:00:00 2001 -From: Hidenori Kobayashi <hidenorik@chromium.org> -Date: Tue, 9 Jan 2024 17:09:09 +0900 -Subject: [PATCH] media: staging: ipu3-imgu: Set fields before - media_entity_pads_init() - -The imgu driver fails to probe with the following message because it -does not set the pad's flags before calling media_entity_pads_init(). - -[ 14.596315] ipu3-imgu 0000:00:05.0: failed initialize subdev media entity (-22) -[ 14.596322] ipu3-imgu 0000:00:05.0: failed to register subdev0 ret (-22) -[ 14.596327] ipu3-imgu 0000:00:05.0: failed to register pipes (-22) -[ 14.596331] ipu3-imgu 0000:00:05.0: failed to create V4L2 devices (-22) - -Fix the initialization order so that the driver probe succeeds. The ops -initialization is also moved together for readability. - -Fixes: a0ca1627b450 ("media: staging/intel-ipu3: Add v4l2 driver based on media framework") -Cc: <stable@vger.kernel.org> # 6.7 -Cc: Dan Carpenter <dan.carpenter@linaro.org> -Signed-off-by: Hidenori Kobayashi <hidenorik@chromium.org> -Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> -Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> -Patchset: cameras ---- - drivers/staging/media/ipu3/ipu3-v4l2.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c -index a66f034380c0..3df58eb3e882 100644 ---- a/drivers/staging/media/ipu3/ipu3-v4l2.c -+++ b/drivers/staging/media/ipu3/ipu3-v4l2.c -@@ -1069,6 +1069,11 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, - struct imgu_media_pipe *imgu_pipe = &imgu->imgu_pipe[pipe]; - - /* Initialize subdev media entity */ -+ imgu_sd->subdev.entity.ops = &imgu_media_ops; -+ for (i = 0; i < IMGU_NODE_NUM; i++) { -+ imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? -+ MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE; -+ } - r = media_entity_pads_init(&imgu_sd->subdev.entity, IMGU_NODE_NUM, - imgu_sd->subdev_pads); - if (r) { -@@ -1076,11 +1081,6 @@ static int imgu_v4l2_subdev_register(struct imgu_device *imgu, - "failed initialize subdev media entity (%d)\n", r); - return r; - } -- imgu_sd->subdev.entity.ops = &imgu_media_ops; -- for (i = 0; i < IMGU_NODE_NUM; i++) { -- imgu_sd->subdev_pads[i].flags = imgu_pipe->nodes[i].output ? -- MEDIA_PAD_FL_SINK : MEDIA_PAD_FL_SOURCE; -- } - - /* Initialize subdev */ - v4l2_subdev_init(&imgu_sd->subdev, &imgu_subdev_ops); -@@ -1177,15 +1177,15 @@ static int imgu_v4l2_node_setup(struct imgu_device *imgu, unsigned int pipe, - } - - /* Initialize media entities */ -+ node->vdev_pad.flags = node->output ? -+ MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK; -+ vdev->entity.ops = NULL; - r = media_entity_pads_init(&vdev->entity, 1, &node->vdev_pad); - if (r) { - dev_err(dev, "failed initialize media entity (%d)\n", r); - mutex_destroy(&node->lock); - return r; - } -- node->vdev_pad.flags = node->output ? -- MEDIA_PAD_FL_SOURCE : MEDIA_PAD_FL_SINK; -- vdev->entity.ops = NULL; - - /* Initialize vbq */ - vbq->type = node->vdev_fmt.type; --- -2.44.0 - From 87ebc160cb35a068acfaf59847c84656cb52b1b7 Mon Sep 17 00:00:00 2001 From: Sakari Ailus <sakari.ailus@linux.intel.com> Date: Thu, 25 May 2023 14:12:04 +0300 diff --git a/SOURCES/patch-6.8-redhat.patch b/SOURCES/patch-6.8-redhat.patch index 977f728..7214ec4 100644 --- a/SOURCES/patch-6.8-redhat.patch +++ b/SOURCES/patch-6.8-redhat.patch @@ -7,6 +7,7 @@ drivers/acpi/irq.c | 17 +- drivers/acpi/scan.c | 9 ++ drivers/ata/libahci.c | 18 +++ + drivers/bluetooth/hci_qca.c | 13 +- drivers/char/ipmi/ipmi_dmi.c | 15 ++ drivers/char/ipmi/ipmi_msghandler.c | 16 +- drivers/firmware/efi/Makefile | 1 + @@ -37,10 +38,10 @@ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ tools/power/cpupower/Makefile | 2 +- - 39 files changed, 674 insertions(+), 178 deletions(-) + 40 files changed, 675 insertions(+), 190 deletions(-) diff --git a/Makefile b/Makefile -index 33d8e822f6f1..0451e4e79e5c 100644 +index c436247d750c..fba81833741a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -125,10 +126,10 @@ index d1f3b56e7afc..eaefd0d7cfff 100644 /* boot_command_line has been already set up in early.c */ *cmdline_p = boot_command_line; diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c -index 84201071dfac..1e7b9e53ec3d 100644 +index 97dd70285741..efc3fbc9e9f3 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c -@@ -21,6 +21,7 @@ +@@ -20,6 +20,7 @@ #include <linux/root_dev.h> #include <linux/hugetlb.h> #include <linux/tboot.h> @@ -136,7 +137,7 @@ index 84201071dfac..1e7b9e53ec3d 100644 #include <linux/usb/xhci-dbgp.h> #include <linux/static_call.h> #include <linux/swiotlb.h> -@@ -901,6 +902,13 @@ void __init setup_arch(char **cmdline_p) +@@ -900,6 +901,13 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); @@ -148,9 +149,9 @@ index 84201071dfac..1e7b9e53ec3d 100644 +#endif + reserve_ibft_region(); - dmi_setup(); + x86_init.resources.dmi_setup(); -@@ -1064,19 +1072,7 @@ void __init setup_arch(char **cmdline_p) +@@ -1063,19 +1071,7 @@ void __init setup_arch(char **cmdline_p) /* Allocate bigger log buffer */ setup_log_buf(1); @@ -282,6 +283,37 @@ index 1a63200ea437..a911e976a596 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/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c +index 8a60ad7acd70..4ecbcb1644cc 100644 +--- a/drivers/bluetooth/hci_qca.c ++++ b/drivers/bluetooth/hci_qca.c +@@ -7,7 +7,6 @@ + * + * Copyright (C) 2007 Texas Instruments, Inc. + * Copyright (c) 2010, 2012, 2018 The Linux Foundation. All rights reserved. +- * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * + * Acknowledgements: + * This file is based on hci_ll.c, which was... +@@ -1904,17 +1903,7 @@ static int qca_setup(struct hci_uart *hu) + case QCA_WCN6750: + case QCA_WCN6855: + case QCA_WCN7850: +- +- /* Set BDA quirk bit for reading BDA value from fwnode property +- * only if that property exist in DT. +- */ +- if (fwnode_property_present(dev_fwnode(hdev->dev.parent), "local-bd-address")) { +- set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); +- bt_dev_info(hdev, "setting quirk bit to read BDA from fwnode later"); +- } else { +- bt_dev_dbg(hdev, "local-bd-address` is not present in the devicetree so not setting quirk bit for BDA"); +- } +- ++ set_bit(HCI_QUIRK_USE_BDADDR_PROPERTY, &hdev->quirks); + hci_set_aosp_capable(hdev); + + ret = qca_read_soc_version(hdev, &ver, soc_type); 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 @@ -356,7 +388,7 @@ index a2d0009560d0..4f3486e6a84b 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 4fcda50acfa4..bbbcff15f587 100644 +index 1ea14e86a741..ae3518be391e 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -33,6 +33,7 @@ @@ -367,7 +399,7 @@ index 4fcda50acfa4..bbbcff15f587 100644 #include <asm/early_ioremap.h> -@@ -990,40 +991,101 @@ int efi_mem_type(unsigned long phys_addr) +@@ -992,40 +993,101 @@ int efi_mem_type(unsigned long phys_addr) return -EINVAL; } @@ -979,7 +1011,7 @@ index cd1210026ac5..448d146c6757 100644 * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 2ebbe51a7efe..503f79c60365 100644 +index eff7f5df08e2..b58145ce7775 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, @@ -1014,7 +1046,7 @@ index 2ebbe51a7efe..503f79c60365 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index bdd0acf7fa3c..2adde1beb158 100644 +index d5d3eea006c1..583d0fa2877d 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -118,6 +118,14 @@ static const char *sd_cache_types[] = { @@ -1032,7 +1064,7 @@ index bdd0acf7fa3c..2adde1beb158 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4069,6 +4077,8 @@ static int __init init_sd(void) +@@ -4084,6 +4092,8 @@ static int __init init_sd(void) goto err_out_class; } @@ -1042,10 +1074,10 @@ index bdd0acf7fa3c..2adde1beb158 100644 if (err) goto err_out_driver; diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index e38a4124f610..0a607946e5f9 100644 +index 64e54163f05e..aaaa9bca0ee5 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5806,6 +5806,13 @@ static void hub_event(struct work_struct *work) +@@ -5815,6 +5815,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1150,7 +1182,7 @@ index c74f47711f0b..e7bbf3b7a938 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 76458b6d53da..b80d5835be72 100644 +index f9b5baf1b5f4..60df2a4b2815 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h @@ -411,6 +411,8 @@ LSM_HOOK(void, LSM_RET_VOID, bpf_prog_free_security, struct bpf_prog_aux *aux) @@ -1365,7 +1397,7 @@ index ab7eea01ab42..fff7c5f737fc 100644 int rmi_register_transport_device(struct rmi_transport_dev *xport); diff --git a/include/linux/security.h b/include/linux/security.h -index d0eb20f90b26..a99c045730e9 100644 +index 3180d823e023..110bca09a1c3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -494,6 +494,7 @@ int security_inode_notifysecctx(struct inode *inode, void *ctx, u32 ctxlen); @@ -1373,7 +1405,7 @@ index d0eb20f90b26..a99c045730e9 100644 int security_inode_getsecctx(struct inode *inode, void **ctx, u32 *ctxlen); int security_locked_down(enum lockdown_reason what); +int security_lock_kernel_down(const char *where, enum lockdown_reason level); - int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, size_t *uctx_len, + int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags); #else /* CONFIG_SECURITY */ @@ -1433,6 +1434,10 @@ static inline int security_locked_down(enum lockdown_reason what) @@ -1385,7 +1417,7 @@ index d0eb20f90b26..a99c045730e9 100644 + return 0; +} static inline int lsm_fill_user_ctx(struct lsm_ctx __user *uctx, - size_t *uctx_len, void *val, size_t val_len, + u32 *uctx_len, void *val, size_t val_len, u64 id, u64 flags) diff --git a/kernel/module/main.c b/kernel/module/main.c index b0b99348e1a8..c35cc48d782c 100644 @@ -1537,10 +1569,10 @@ index cd84d8ea1dfb..e4c70a0312bc 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 7035ee35a393..e1d54a896ef9 100644 +index a344b8fa5530..51b5bea3b0c7 100644 --- a/security/security.c +++ b/security/security.c -@@ -5511,6 +5511,18 @@ int security_locked_down(enum lockdown_reason what) +@@ -5517,6 +5517,18 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/SOURCES/t2linux.patch b/SOURCES/t2linux.patch index 4313c53..e167e73 100644 --- a/SOURCES/t2linux.patch +++ b/SOURCES/t2linux.patch @@ -11901,110 +11901,3 @@ index 442396f6ed1f..baf7264d7b94 100644 /* Dell Inspiron N4010 */ -- 2.42.1 - -From 923cfe9b86c71761b164f995631817e9af169f29 Mon Sep 17 00:00:00 2001 -From: Hector Martin <marcan@marcan.st> -Date: Tue, 14 Feb 2023 18:33:19 +0900 -Subject: [PATCH] brcmfmac: cfg80211: Use WSEC to set SAE password - -Using the WSEC command instead of sae_password seems to be the supported -mechanism on newer firmware, and also how the brcmdhd driver does it. - -Signed-off-by: Hector Martin <marcan@marcan.st> ---- - .../broadcom/brcm80211/brcmfmac/cfg80211.c | 46 ++++++++----------- - .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- - 2 files changed, 20 insertions(+), 28 deletions(-) - -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -index 87f4d53fb..7ccdbafca 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c -@@ -1682,52 +1682,44 @@ static u16 brcmf_map_fw_linkdown_reason(const struct brcmf_event_msg *e) - return reason; - } - --static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len) -+static int brcmf_set_wsec(struct brcmf_if *ifp, const u8 *key, u16 key_len, u16 flags) - { - struct brcmf_pub *drvr = ifp->drvr; - struct brcmf_wsec_pmk_le pmk; - int err; - -+ if (key_len > sizeof(pmk.key)) { -+ bphy_err(drvr, "key must be less than %zu bytes\n", -+ sizeof(pmk.key)); -+ return -EINVAL; -+ } -+ - memset(&pmk, 0, sizeof(pmk)); - -- /* pass pmk directly */ -- pmk.key_len = cpu_to_le16(pmk_len); -- pmk.flags = cpu_to_le16(0); -- memcpy(pmk.key, pmk_data, pmk_len); -+ /* pass key material directly */ -+ pmk.key_len = cpu_to_le16(key_len); -+ pmk.flags = cpu_to_le16(flags); -+ memcpy(pmk.key, key, key_len); - -- /* store psk in firmware */ -+ /* store key material in firmware */ - err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_WSEC_PMK, - &pmk, sizeof(pmk)); - if (err < 0) - bphy_err(drvr, "failed to change PSK in firmware (len=%u)\n", -- pmk_len); -+ key_len); - - return err; - } - -+static int brcmf_set_pmk(struct brcmf_if *ifp, const u8 *pmk_data, u16 pmk_len) -+{ -+ return brcmf_set_wsec(ifp, pmk_data, pmk_len, 0); -+} -+ - static int brcmf_set_sae_password(struct brcmf_if *ifp, const u8 *pwd_data, - u16 pwd_len) - { -- struct brcmf_pub *drvr = ifp->drvr; -- struct brcmf_wsec_sae_pwd_le sae_pwd; -- int err; -- -- if (pwd_len > BRCMF_WSEC_MAX_SAE_PASSWORD_LEN) { -- bphy_err(drvr, "sae_password must be less than %d\n", -- BRCMF_WSEC_MAX_SAE_PASSWORD_LEN); -- return -EINVAL; -- } -- -- sae_pwd.key_len = cpu_to_le16(pwd_len); -- memcpy(sae_pwd.key, pwd_data, pwd_len); -- -- err = brcmf_fil_iovar_data_set(ifp, "sae_password", &sae_pwd, -- sizeof(sae_pwd)); -- if (err < 0) -- bphy_err(drvr, "failed to set SAE password in firmware (len=%u)\n", -- pwd_len); -- -- return err; -+ return brcmf_set_wsec(ifp, pwd_data, pwd_len, BRCMF_WSEC_PASSPHRASE); - } - - static void brcmf_link_down(struct brcmf_cfg80211_vif *vif, u16 reason, -diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h -index 792adaf88..3ba90878c 100644 ---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h -+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h -@@ -574,7 +574,7 @@ struct brcmf_wsec_key_le { - struct brcmf_wsec_pmk_le { - __le16 key_len; - __le16 flags; -- u8 key[2 * BRCMF_WSEC_MAX_PSK_LEN + 1]; -+ u8 key[BRCMF_WSEC_MAX_SAE_PASSWORD_LEN]; - }; - - /** --- -2.37.2 - |