[PR PATCH] linux6.2: update to 6.2.10

[PR PATCH] linux6.2: update to 6.2.10

[atk]

[-- Attachment #1: Type: text/plain, Size: 1384 bytes --]

There is a new pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.10
https://github.com/void-linux/void-packages/pull/43420

linux6.2: update to 6.2.10
+ backport of patch for mt62 wireless driver - I had recurring issues with this free-after-use error that led to a crash in the network driver

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43420.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.10-43420.patch --]
[-- Type: text/x-diff, Size: 3139 bytes --]

From 8f6fe4641bb915db5ccaf00720d10a4bfefe8ad7 Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 13 Apr 2023 10:56:45 +0200
Subject: [PATCH] linux6.2: update to 6.2.10

downport of patch for mt62 wireless driver
---
 ...x-use-after-free-in-fw-features-query.diff | 40 +++++++++++++++++++
 srcpkgs/linux6.2/template                     |  4 +-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create 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
new file mode 100644
index 000000000000..f508877af224
--- /dev/null
+++ b/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
@@ -0,0 +1,40 @@
+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 812d3b69f524..ccaf1f30f122 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.8
+version=6.2.10
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 3d53cfde45e0c38921dd96fb8d4fee2b2730da6ad86d324ce9ed61ebbeb029dc"
+ 399a93fbdf775bb62e6e2f1a36e3391dbf26f427c0a5bef58f028c6ce1966ab0"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: linux6.2: update to 6.2.10

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 211 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/43420#issuecomment-1508598101

Comment:
this is in 6.2.11, maybe update to that? also, you may want to [ci skip]

Re: linux6.2: update to 6.2.10

[atk]

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/43420#issuecomment-1508709489

Comment:
6.2.11 wasn't available when I did this. However, the fix in question (https://patchwork.kernel.org/project/linux-wireless/patch/51fd8f76494348aa9ecbf0abc471ebe47a983dfd.1679502607.git.lorenzo@kernel.org/) is *not* yet in 6.2.11 (https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/diff/drivers/net/wireless/mediatek/mt76/mt7921/main.c?id=v6.2.11&id2=v6.2.8&context=5&ignorews=0&dt=0).

Re: linux6.2: update to 6.2.10

[dkwo]

[-- Attachment #1: Type: text/plain, Size: 198 bytes --]

New comment by dkwo on void-packages repository

https://github.com/void-linux/void-packages/pull/43420#issuecomment-1508767254

Comment:
my bad, sorry (i saw a commit with wifi by the same author)

Re: linux6.2: update to 6.2.10

[atk]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

New comment by atk on void-packages repository

https://github.com/void-linux/void-packages/pull/43420#issuecomment-1508789648

Comment:
In any case, I'll update the PR.

Re: [PR PATCH] [Updated] linux6.2: update to 6.2.10

[atk]

[-- Attachment #1: Type: text/plain, Size: 1389 bytes --]

There is an updated pull request by atk against master on the void-packages repository

https://github.com/atk/void-packages linux6.2.10
https://github.com/void-linux/void-packages/pull/43420

linux6.2: update to 6.2.10
+ backport of patch for mt62 wireless driver - I had recurring issues with this free-after-use error that led to a crash in the network driver

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43420.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-linux6.2.10-43420.patch --]
[-- Type: text/x-diff, Size: 3150 bytes --]

From 4d1222b2f7b3204a3f7436376cd44d976044f07c Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Thu, 13 Apr 2023 10:56:45 +0200
Subject: [PATCH] linux6.2: update to 6.2.11

downport of patch for mt62 wireless driver

[ci skip]
---
 ...x-use-after-free-in-fw-features-query.diff | 40 +++++++++++++++++++
 srcpkgs/linux6.2/template                     |  4 +-
 2 files changed, 42 insertions(+), 2 deletions(-)
 create 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
new file mode 100644
index 000000000000..f508877af224
--- /dev/null
+++ b/srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff
@@ -0,0 +1,40 @@
+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 812d3b69f524..9bd2d5779d6f 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.8
+version=6.2.11
 revision=1
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="John <me@johnnynator.dev>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
 fi
 
 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
- 3d53cfde45e0c38921dd96fb8d4fee2b2730da6ad86d324ce9ed61ebbeb029dc"
+ 923cbd9f2120a7972a45cfdfcfd1871f76735de36cee2630d10a6a3d5c845149"
 python_version=3
 
 # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.

Re: [PR PATCH] [Merged]: linux6.2: update to 6.2.10

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

There's a merged pull request on the void-packages repository

linux6.2: update to 6.2.10
https://github.com/void-linux/void-packages/pull/43420

Description:
+ backport of patch for mt62 wireless driver - I had recurring issues with this free-after-use error that led to a crash in the network driver

<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->