From b07cb164d5db51ffd2ca52fd4197b9057f374dbd Mon Sep 17 00:00:00 2001 From: Alex Lohr Date: Thu, 11 May 2023 21:10:36 +0200 Subject: [PATCH] linux6.2: update to 6.2.15 --- ...x-use-after-free-in-fw-features-query.diff | 40 ------------------- srcpkgs/linux6.2/template | 4 +- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff diff --git a/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff b/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff deleted file mode 100644 index f508877af224..000000000000 --- a/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff +++ /dev/null @@ -1,40 +0,0 @@ -Taken from https://patchwork.kernel.org/project/linux-wireless/patch/51fd8f76494348aa9ecbf0abc471ebe47a983dfd.1679502607.git.lorenzo@kernel.org/ - -diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c -index 80c71acfe159..cc94531185da 100644 ---- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c -+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c -@@ -171,12 +171,12 @@ mt7921_mac_init_band(struct mt7921_dev *dev, u8 band) - - u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm) - { -- struct mt7921_fw_features *features = NULL; - const struct mt76_connac2_fw_trailer *hdr; - struct mt7921_realease_info *rel_info; - const struct firmware *fw; - int ret, i, offset = 0; - const u8 *data, *end; -+ u8 offload_caps = 0; - - ret = request_firmware(&fw, fw_wm, dev); - if (ret) -@@ -208,7 +208,10 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm) - data += sizeof(*rel_info); - - if (rel_info->tag == MT7921_FW_TAG_FEATURE) { -+ struct mt7921_fw_features *features; -+ - features = (struct mt7921_fw_features *)data; -+ offload_caps = features->data; - break; - } - -@@ -218,7 +221,7 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm) - out: - release_firmware(fw); - -- return features ? features->data : 0; -+ return offload_caps; - } - EXPORT_SYMBOL_GPL(mt7921_check_offload_capability); - diff --git a/srcpkgs/linux6.2/template b/srcpkgs/linux6.2/template index 12ae8bdcc9aa..970ce644770e 100644 --- a/srcpkgs/linux6.2/template +++ b/srcpkgs/linux6.2/template @@ -1,6 +1,6 @@ # Template file for 'linux6.2' pkgname=linux6.2 -version=6.2.13 +version=6.2.15 revision=1 short_desc="Linux kernel and modules (${version%.*} series)" maintainer="John " @@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then fi checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1 - 1f2e2fdf1ed70fa586cacba2f69ece086a5dda19e46e8a5922cae6890cbe67bd" + 398b3d1187454f32b5168b7a01eb294f214634042d89ac79f82c56411566cb9b" python_version=3 # XXX Restrict archs until a proper -dotconfig is available in FILESDIR.