From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EEB9D196C7C for ; Thu, 10 Sep 2026 01:24:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789003448; cv=none; b=D7/EqrgVhEPKx4feMqpG0ul/mOQZwssL+dgCrCRxnAB4p0dBnuudjxZviqlf9mQcMqDPu3/nwB8aJtxr/nt8rDqjhDkWDyTweAU0hIZoPvz1v4iOAb/rDX9WmEVkXGMxjibhRHMD83lc45Nawn55GOYGoIixMV9/7vwgmxLwvXs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789003448; c=relaxed/simple; bh=6jJxmPTfasXgc07lcdBIc+riLMsKRt1hE6Wc1Cjmo/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aQXLfYUkubgyt4RQmCqsALJ9R3srRf8Xj8p1Gaz4Docce2m+Tzge4eZ6XogaA/+OPTk+pa54ofwrJqLq15bREBhXi9UzsRmsIitUJJJQjt09UzypGpdJL9fuwd/muMkBo0zTJ6syrEsEsTNFoYCSOb3cOhIY6OOGwT872Sfx8RA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WUqtwauS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WUqtwauS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 131E61F00898; Thu, 10 Sep 2026 01:24:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1789003446; bh=IwQlwgtneQyFCJx52UXjG5a49kxT2OTvbtQzRG6iIEE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WUqtwauScOpp71zu/d7kIc9GIK3o5RjI04QjP65H1QOzVVVsCwMX9OJLy5zYdMe74 z4bfjemrEF/BX5nNlQrhlMDcsP+9Dw7SdIP3MgkqgU/Qruy+y2VivIs6K/JxGcEOuZ inbt8IWCboHPY/tHadm4HDoOo723UAnRBScb2Ei2ePGXzOMjD7fhlwgdPqkS9cM1Dd AklFUN6Y5Cv1kKJEAvk0Pgjhq7OmFqxkPhP/x7lkvSRYESwtszJODCnpIH9/I2jwyV ZSdLheAX4unL8XGyhTXG8A83JGFmUEZB8D3RoY7/aSh8XXuVnXN/RlM/OaVn2ETD9m vTSZf0Qoq87fw== From: Sasha Levin To: stable@vger.kernel.org Cc: Bryam Vargas , Felix Fietkau , Sasha Levin Subject: [PATCH 6.1.y 2/2] wifi: mt76: mt7915: bound the device EEPROM address before the EFUSE copy Date: Wed, 9 Sep 2026 21:24:03 -0400 Message-ID: <20260910012403.3854761-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260910012403.3854761-1-sashal@kernel.org> References: <2026090457-rental-precise-67a9@gregkh> <20260910012403.3854761-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Bryam Vargas [ Upstream commit 44b5adfe49499f53002737f5fe81d608c08122fc ] mt7915_mcu_get_eeprom() copies a fixed EFUSE block into the driver's dev->mt76.eeprom.data buffer at the offset reported by the MCU response (res->addr, a device-controlled __le32) without checking it against the buffer size. A malicious or malfunctioning device can report an arbitrary address and drive a 16-byte out-of-bounds write past eeprom.data. Reject a response whose address would place the copy outside eeprom.data before deriving the destination pointer. Devices that echo the requested in-bounds offset are unaffected. Fixes: e57b7901469f ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets") Cc: stable@vger.kernel.org Signed-off-by: Bryam Vargas Link: https://patch.msgid.link/20260625-b4-disp-16f99062-v1-1-aee52ecf61b9@proton.me Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index d7f297705d717..27e1725dcbfe4 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -2763,8 +2763,15 @@ int mt7915_mcu_get_eeprom(struct mt7915_dev *dev, u32 offset, u8 *read_buf) return ret; res = (struct mt7915_mcu_eeprom_info *)skb->data; - if (!buf) - buf = dev->mt76.eeprom.data + le32_to_cpu(res->addr); + if (!buf) { + u32 addr = le32_to_cpu(res->addr); + + if (addr > dev->mt76.eeprom.size - MT7915_EEPROM_BLOCK_SIZE) { + dev_kfree_skb(skb); + return -EINVAL; + } + buf = dev->mt76.eeprom.data + addr; + } memcpy(buf, res->data, MT7915_EEPROM_BLOCK_SIZE); dev_kfree_skb(skb); -- 2.53.0