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=1794062742; b=uZSPQm/sIFpGlGMdcUPTWwlHZuWjuUF9j1Xko4W6mmpnmVabrlUAvpHXZK1Y/nO2D/Sz wQEPzx3gUyubQvYGpwzBNTopHFUdj8DFQq8WA56gFlDyDHq/u75gOwA7wJtGIiROZ7ul9 rdJqUo7Qg7uU+42vYo0BZOCsvmuOjwLaiGqpyMI0nsJylcAvObmnysXqLg9bOU1C8GV/8 7O5Pz4VNPn30ZIfown9gnd3P6xmuZRxbGspss0PHNA8KoHanYSCyXwCJaLPGZ9Yqmi2Jd nXHfdDGjKKFp7V5FAUtJT81npzRGJZnqeHbxGskuQyRadd0wFsNl3I24ORGabEVneWg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794062742; 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=sJPK2uE9pf/gY8tUUyIlUeqa+/MEVnzwSft6vW5fIRQ=; b=wy9OqKG4LcdItaLYterYqlJyfqxqYJHwILvwi7MAKiPvrpnBusdpf70NEZHEGkxBRLoB QSfulrctAIXGguJkJQLLgXMH34lV9RiL1a46NpD9alr8A+Hp9VtKVqovgNn2SwwI5eMPd VFJ2daUrWbYcL8xFKSfhjmlzsEHbKv1GbqnuROlP5IWAYc2s+PW6ltKRqipNc0cjULQdT VKGk9mmSZp25I+fIliSKRXVPJ1QIC9Iet/YOjh7W1cSxpyrF5aLIrnRh96OvbmCQJmWF+ MZzl2h3DgWY/Reh2RX4IqngYGRjKrErmnvmylqU5NKvgOagXzjGxFD0xRDnnrdB3lVw== 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=h+JAMlgR; 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 2535F606A32E; Sat, 7 Nov 2026 14:45:42 +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=h+JAMlgR Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6A261F0089F; Sat, 7 Nov 2026 14:45:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794062742; bh=sJPK2uE9pf/gY8tUUyIlUeqa+/MEVnzwSft6vW5fIRQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h+JAMlgRUzmyLJuox3W++fDszyGolq9+CR/l7RPj3CqhO1gbMuvJumCwwl+jXykUc F+qXwPqnx2oJEnSILREo4ouGNqONESZ2B9GCm4+3d+0+sm8IZdl85FwY712bwRgunZ UPhWVQifUBxqlWHgFIWtEKPTdfSq8e+iTOnTeRhc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ping-Ke Shih , Laxman Acharya Padhya , Sasha Levin Subject: [PATCH 6.18 058/869] wifi: rtw89: cap firmware section_num before parsing Date: Sat, 7 Nov 2026 08:45:40 -0500 Message-ID: <20261107134854.057305356@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Laxman Acharya Padhya [ Upstream commit 273b0a8be083df6d0319ce62caa870e927f94a31 ] rtw89_fw_bin_info.section_info has FWDL_SECTION_MAX_NUM (10) entries. The v0/v1 header parsers take section_num from an 8-bit firmware field (0..255) and write info->section_info[i] with no cap. rtw89_fw_download_suit() keeps that object on the stack, so a crafted firmware blob overflows the stack. Reject a truncated header and a section table that does not fit in the firmware image before reading fw_hdr->sections[i]. Fixes: e3ec7017f6a2 ("rtw89: add Realtek 802.11ax driver") Cc: stable@vger.kernel.org Acked-by: Ping-Ke Shih Signed-off-by: Laxman Acharya Padhya Signed-off-by: Ping-Ke Shih Link: https://patch.msgid.link/20260825174438.63168-1-acharyalaxman8848@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw89/fw.c | 32 +++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/net/wireless/realtek/rtw89/fw.c b/drivers/net/wireless/realtek/rtw89/fw.c index 299526220380f..c4fb9c226faeb 100644 --- a/drivers/net/wireless/realtek/rtw89/fw.c +++ b/drivers/net/wireless/realtek/rtw89/fw.c @@ -156,8 +156,24 @@ static int rtw89_fw_hdr_parser_v0(struct rtw89_dev *rtwdev, const u8 *fw, u32 le if (!info) return -EINVAL; + if (len < sizeof(*fw_hdr)) { + rtw89_err(rtwdev, "[ERR]fw header truncated\n"); + return -EINVAL; + } + info->section_num = le32_get_bits(fw_hdr->w6, FW_HDR_W6_SEC_NUM); + if (!info->section_num || info->section_num > FWDL_SECTION_MAX_NUM) { + rtw89_err(rtwdev, "[ERR]invalid fw section num %u\n", + info->section_num); + return -EINVAL; + } + base_hdr_len = struct_size(fw_hdr, sections, info->section_num); + if (base_hdr_len > len) { + rtw89_err(rtwdev, "[ERR]fw header truncated\n"); + return -EINVAL; + } + info->dynamic_hdr_en = le32_get_bits(fw_hdr->w7, FW_HDR_W7_DYN_HDR); info->idmem_share_mode = le32_get_bits(fw_hdr->w7, FW_HDR_W7_IDMEM_SHARE_MODE); @@ -449,9 +465,25 @@ static int rtw89_fw_hdr_parser_v1(struct rtw89_dev *rtwdev, const u8 *fw, u32 le int ret; u32 i; + if (len < sizeof(*fw_hdr)) { + rtw89_err(rtwdev, "[ERR]fw header truncated\n"); + return -EINVAL; + } + info->section_num = le32_get_bits(fw_hdr->w6, FW_HDR_V1_W6_SEC_NUM); + if (!info->section_num || info->section_num > FWDL_SECTION_MAX_NUM) { + rtw89_err(rtwdev, "[ERR]invalid fw section num %u\n", + info->section_num); + return -EINVAL; + } + info->dsp_checksum = le32_get_bits(fw_hdr->w6, FW_HDR_V1_W6_DSP_CHKSUM); base_hdr_len = struct_size(fw_hdr, sections, info->section_num); + if (base_hdr_len > len) { + rtw89_err(rtwdev, "[ERR]fw header truncated\n"); + return -EINVAL; + } + info->dynamic_hdr_en = le32_get_bits(fw_hdr->w7, FW_HDR_V1_W7_DYN_HDR); info->idmem_share_mode = le32_get_bits(fw_hdr->w7, FW_HDR_V1_W7_IDMEM_SHARE_MODE); -- 2.53.0