wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-06-05 06:33:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

linux6.2: update to 6.2.11

Browse source 
downport of patch for mt62 wireless driver

[ci skip]
This commit is contained in:
Alex Lohr 2023-04-13 10:56:45 +02:00 • committed by John Zimmermann
parent b02db3dd8c
commit 71eb82fcba
2 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
srcpkgs/linux6.2/patches/v3-wireless-mt76-mt7921-Fix-use-after-free-in-fw-features-query.diff Normal file
View file

@ -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);

4
srcpkgs/linux6.2/template
View file

@ -1,6 +1,6 @@
# Template file for 'linux6.2' # Template file for 'linux6.2'
pkgname=linux6.2 pkgname=linux6.2
version=6.2.8 version=6.2.11
revision=1 revision=1
short_desc="Linux kernel and modules (${version%.*} series)" short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="John <me@johnnynator.dev>" maintainer="John <me@johnnynator.dev>"
@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi fi
checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1 checksum="74862fa8ab40edae85bb3385c0b71fe103288bce518526d63197800b3cbdecb1
3d53cfde45e0c38921dd96fb8d4fee2b2730da6ad86d324ce9ed61ebbeb029dc" 923cbd9f2120a7972a45cfdfcfd1871f76735de36cee2630d10a6a3d5c845149"
python_version=3 python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR. # XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.