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=1793211812; b=ILYscf33n/fOpv57K1rsJVLfawAENcJ24y0Bo3aZU86v4zJY2NCsz9RP1VphSUqPJfee kmrizPFvfdVJaE/U/wpApyS2OJkgfRJQcgr+jLiXBKG4GNaTFivf0DZAuBYMe2KJ7p5OB qof/IRV7K7el/WLVCrnAXKGIc4zAJBNeoOrSnEWKC8PxG+bi5v1t5g+dmhxS2ldGePClR iUX39je+GiOQ8CcOCEv/IKniDOSwuuQMsWgBC4Pa3ggK21Lrt+BbZ/EBUyyruXRQR9/40 3jQIWGOkPf51NQ3ZHUi1ym9QV81llbYLiFZEBSGj54MgSZL20BG/Nh4DlDPhfGGFS6w== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793211812; 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=SiMMycl9X/t1DHY8zlHwUXmQLXc1S76N+VGKWVtW+aI=; b=0LyCyKsz+DevqYg35Q1v2vHXdXRJ8e9c45c9lJsbOjb3bYw8aCKZHKJ1hPmIgQHmJMLC 09c6rYKprkD0ooO88rVdM0JNFjAnuundTQ0gJc7BWGUacRgrhstxiiAs27453KtLWjcsQ tT00uTn2V6PT/ydJkzbFgo5kLKudpwNKI6V3CU4Wt3L9nDAB+eDBo1Z0fHneaytdkcA0I srpqvoVrbCD7pfs4r5Hjrx/vweD9+I87juTp6ZdcPayRHyFw316orEXh0yBXkKa/ahgre JIv/1fUhinM4Nr/A82gx1ngbpu62lcwpWtgIV8thUznswBmYOODCMYvezHuS+a51IiQ== 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=dZAG2t7R; 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 86294606A325; Wed, 28 Oct 2026 18:23:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=dZAG2t7R Received: by smtp.kernel.org (Postfix) with ESMTPSA id D5BB11F01825; Wed, 28 Oct 2026 18:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793211812; bh=SiMMycl9X/t1DHY8zlHwUXmQLXc1S76N+VGKWVtW+aI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dZAG2t7RJkWeUhyAIzt8Xfek90JdAATWjMeI51TCOzd1iRKcVDSxMeoVqBEnONELR q96bvMPGJewS7h/lTxV1a/cpDjvohJuCBJxRFZQrWCGh85P66/EyaoaixRpW1PbVwU U+1j/m1VtN4lUw226jFcfVvPus+7Z/99RCKRBGeM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Heyang Tan , Christian Lamparter , Johannes Berg Subject: [PATCH 5.15 507/571] wifi: p54: validate firmware record lengths Date: Wed, 28 Oct 2026 18:00:54 +0100 Message-ID: <20261028170020.058862019@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261028170008.009143722@linuxfoundation.org> References: <20261028170008.009143722@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heyang Tan commit db7b86bd97b380ece8fa39cfdd7502a9fd35e56f upstream. The p54 firmware parser accesses component ID and component version records without checking that their lengths cover the fields being read. A malformed record can therefore make the parser read past the record. Validate the component ID and component version record lengths before accessing their data. The descriptor record is also checked against the shortest descriptor length found in the supported firmware images. Reject descriptor values that underflow the RX offset or produce an empty RX range before updating the driver state. Assisted-by: LLM Codex Signed-off-by: Heyang Tan Tested-by: Christian Lamparter Link: https://patch.msgid.link/20260918083349.891-1-thy15333007817@163.com Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/intersil/p54/fwio.c | 42 +++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 5 deletions(-) --- a/drivers/net/wireless/intersil/p54/fwio.c +++ b/drivers/net/wireless/intersil/p54/fwio.c @@ -52,6 +52,13 @@ int p54_parse_firmware(struct ieee80211_ u32 code = le32_to_cpu(bootrec->code); switch (code) { case BR_CODE_COMPONENT_ID: + if (len < sizeof(struct bootrec_comp_id) / + sizeof(*bootrec->data)) { + wiphy_err(priv->hw->wiphy, + "firmware component ID is too short\n"); + return -EINVAL; + } + priv->fw_interface = be32_to_cpup((__be32 *) bootrec->data); switch (priv->fw_interface) { @@ -72,16 +79,41 @@ int p54_parse_firmware(struct ieee80211_ } break; case BR_CODE_COMPONENT_VERSION: + if (len < DIV_ROUND_UP(sizeof(struct bootrec_comp_ver), + sizeof(*bootrec->data))) { + wiphy_err(priv->hw->wiphy, + "firmware component version is too short\n"); + return -EINVAL; + } + /* 24 bytes should be enough for all firmwares */ - if (strnlen((unsigned char *) bootrec->data, 24) < 24) - fw_version = (unsigned char *) bootrec->data; + if (strnlen((unsigned char *)bootrec->data, + sizeof(struct bootrec_comp_ver)) < + sizeof(struct bootrec_comp_ver)) + fw_version = (unsigned char *)bootrec->data; break; case BR_CODE_DESCR: { struct bootrec_desc *desc = (struct bootrec_desc *)bootrec->data; - priv->rx_start = le32_to_cpu(desc->rx_start); - /* FIXME add sanity checking */ - priv->rx_end = le32_to_cpu(desc->rx_end) - 0x3500; + u32 rx_start, rx_end; + + /* 0xa is the shortest descriptor in supported firmware. */ + if (len < 0xa) { + wiphy_err(priv->hw->wiphy, + "firmware descriptor is too short\n"); + return -EINVAL; + } + + rx_start = le32_to_cpu(desc->rx_start); + rx_end = le32_to_cpu(desc->rx_end); + if (rx_end < 0x3500 || rx_end - 0x3500 <= rx_start) { + wiphy_err(priv->hw->wiphy, + "firmware descriptor has invalid RX range\n"); + return -EINVAL; + } + + priv->rx_start = rx_start; + priv->rx_end = rx_end - 0x3500; priv->headroom = desc->headroom; priv->tailroom = desc->tailroom; priv->privacy_caps = desc->privacy_caps;