Skip to content

Commit 2ceb76f

Browse files
greearbKalle Valo
authored andcommitted
wifi: mt76: mt7921: Fix use-after-free in fw features query.
Stop referencing 'features' memory after release_firmware is called. Fixes this crash: RIP: 0010:mt7921_check_offload_capability+0x17d mt7921_pci_probe+0xca/0x4b0 ... Signed-off-by: Ben Greear <[email protected]> Signed-off-by: Lorenzo Bianconi <[email protected]> Acked-by: Felix Fietkau <[email protected]> Signed-off-by: Kalle Valo <[email protected]> Link: https://lore.kernel.org/r/51fd8f76494348aa9ecbf0abc471ebe47a983dfd.1679502607.git.lorenzo@kernel.org
1 parent e4efa51 commit 2ceb76f

File tree

1 file changed

+5
-2
lines changed
  • drivers/net/wireless/mediatek/mt76/mt7921

1 file changed

+5
-2
lines changed

drivers/net/wireless/mediatek/mt76/mt7921/init.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,12 @@ mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)
171171

172172
u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
173173
{
174-
struct mt7921_fw_features *features = NULL;
175174
const struct mt76_connac2_fw_trailer *hdr;
176175
struct mt7921_realease_info *rel_info;
177176
const struct firmware *fw;
178177
int ret, i, offset = 0;
179178
const u8 *data, *end;
179+
u8 offload_caps = 0;
180180

181181
ret = request_firmware(&fw, fw_wm, dev);
182182
if (ret)
@@ -208,7 +208,10 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
208208
data += sizeof(*rel_info);
209209

210210
if (rel_info->tag == MT7921_FW_TAG_FEATURE) {
211+
struct mt7921_fw_features *features;
212+
211213
features = (struct mt7921_fw_features *)data;
214+
offload_caps = features->data;
212215
break;
213216
}
214217

@@ -218,7 +221,7 @@ u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)
218221
out:
219222
release_firmware(fw);
220223

221-
return features ? features->data : 0;
224+
return offload_caps;
222225
}
223226
EXPORT_SYMBOL_GPL(mt7921_check_offload_capability);
224227

0 commit comments

Comments
 (0)