From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795031231; b=wKC3Kwpstz+DE6/QH1R2H6OEwEDJX0m+uZ8dlNFj4pV0bDbklOsqGZI4lj5lnoeqL1Ho dfLF61v3eaqh5tkwFMmGCp9sXq/pE7NnRE2XKj9+PaiybeQNJniFf6Z0bebPJwydp+v2u sDcqpSVdsai+74PoKOelIn7eDGQ/kxG983XP0IHR2O30+cmAEXWOMDf2bNln2hT0Ey/7l dyXhsKjYP5JMTt7uwBEHWdEHRmx7hKjk6GEMt+rsOdQEkmqp+frULY1rqXUB/hsJuwQf+ TBjCjprTa9URa66zfuHofNr1YBLRl8VuJPTCZhNr+tr1KLcbC5xcKO5XC1QxBa/L1eQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795031231; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=V661mfTrWGKZ2Qesb1bpmJ06evJlWAOBnihIy9ucw+M=; b=NSMO3qj9Bo5UJgb4Zj7pjoWZDt6Lzb9InpdecRERiXlM01AH3INq7gi5Gyxgvg3L2+ta hdnjRQl5PNOnLRrJBWcgHFXqTWtp+k85diP/xFaO0iPu22MgGbfUE/CrJyL0Kxekr2Tpt naQG2T905md0Vt5cv9+tnz3X2lexOonQ7oHOulF8qj3UjMp903YU/IZwMIKWCT6mmK9uw AZErYVomGoE1UjJ233RxS4Blz9KkgvMaaUs2ML0k68VAcSeAMs/d59IdcP+tjpRoFZY/u L73rQumJ9nKcUkKnS8BIiVtR0HJ+FR5nEDlstOxfB2eIKz5hbmdsBpIC8ytwFG/JUGA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xMpRXWje; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 50F3E606A320; Wed, 18 Nov 2026 19:47:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=xMpRXWje Received: by smtp.kernel.org (Postfix) with ESMTPSA id A646B1F000C4; Wed, 18 Nov 2026 19:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795031231; bh=V661mfTrWGKZ2Qesb1bpmJ06evJlWAOBnihIy9ucw+M=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=xMpRXWjepjKTZen9Pt/HNJNb9QYCB5qNQ+8N+/T5TMFQ7QtuJHfHB3XRFeCOWDAmY 2oGiE0oudoGe5lhUGfQr1SdtSz4pFWZoaG4BTrMcD7tEj39KPzTXp4YiYRjzT8x47U bXDQaFnol6KO+YXFtLjCBzb68oWHfQN/QZpcj/Sw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiale Yao , Felix Fietkau , Sasha Levin Subject: [PATCH 6.12 0968/1756] wifi: mt76: mt7615: usb: fix source overread in mt7663u_copy Date: Wed, 18 Nov 2026 15:51:35 +0100 Message-ID: <20261118150048.668962660@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jiale Yao [ Upstream commit 0c2fcb5225361f71905697ef9db287b24bcc67cf ] mt7663u_copy() rounds up len to a multiple of four and uses the rounded length as the bound for memcpy() from the source buffer. When the caller's length is not four-byte aligned, the final copy reads up to three bytes past the source buffer. Keep the original length for the source copy and zero the remaining bytes in the transmit buffer so that the hardware access width remains four-byte aligned. Fixes: 6cb596ba84e3 ("mt76: usb: introduce __mt76u_init utility routine") Signed-off-by: Jiale Yao Link: https://patch.msgid.link/20260925150556.2304003-3-yaojiale02@163.com Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c index 4aa9fa1c4a23b..6452acfcd57e3 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c @@ -58,15 +58,22 @@ static void mt7663u_copy(struct mt76_dev *dev, u32 offset, const void *data, int len) { struct mt76_usb *usb = &dev->usb; - int ret, i = 0, batch_len; const u8 *val = data; + int len_aligned; + int batch_len; + int copy_len; + int ret; + int i = 0; - len = round_up(len, 4); + len_aligned = round_up(len, 4); mutex_lock(&usb->usb_ctrl_mtx); - while (i < len) { - batch_len = min_t(int, usb->data_len, len - i); - memcpy(usb->data, val + i, batch_len); + while (i < len_aligned) { + batch_len = min_t(int, usb->data_len, len_aligned - i); + copy_len = min_t(int, batch_len, len - i); + memcpy(usb->data, val + i, copy_len); + if (copy_len < batch_len) + memset(usb->data + copy_len, 0, batch_len - copy_len); ret = __mt76u_vendor_request(dev, MT_VEND_WRITE_EXT, USB_DIR_OUT | USB_TYPE_VENDOR, (offset + i) >> 16, offset + i, -- 2.53.0