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 94A9D2F0673; Sat, 12 Sep 2026 16:19:37 +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=1789229979; cv=none; b=XSFeLumU1vOhkIxwFQf8IAsNXfaCrrPYFiBL5JnXJ7G6v+cPT/TDYyF23xfpUHVoKVFap6T7NgvJf5jnz4J0HY85Zu4aBoIL6ffnNhRKZ62hbJUxY2nGaX/P0VE/SuvKOS768GO5/NTsi5jD5mvs8wZAk5ym8B9Fbg/En153sbA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789229979; c=relaxed/simple; bh=BXih80LvVzV2xPSZL/eH8+BGvyQRX5Z2EmU8J6tIceM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cEtut4Q75gcHIFVttHz6Rr20Th4AXES+XhBwWEwrtIMkE5z/qWOjC4qxyYT0f1CpQburpAk89RaERStmOV9vNjHozd0Gl7ZkW2DLjls9xZff0CNn4fqdTsw/oYH9OcXRx0OrGd3V6vG5iVytV0/dXoCRKHJBtwN+5eWqdemCYDY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=BICdys2D; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="BICdys2D" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 99B671F000FF; Sat, 12 Sep 2026 16:19:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789229977; bh=B83pwwWQvonelMXnqV6eQMBH1ThRx4R5IenJZ6QPPgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BICdys2DKTrR5jZtLF0SLN9X211NCymHaCU9TZixjGFzLBE03g8K050xjTavXgH6E giZ0+mf8bm5b374nRL4ssJgfnJVDKDbEQowlk0wvh8jv+KXN+om10H/ocjaO9ZiOt7 pqy64Qb96jXk/ZFnd0tsP8p+xCEQQhM89aVVgNKA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rameshkumar Sundaram , Baochen Qiang , Jeff Johnson , Sasha Levin Subject: [PATCH 6.1 0701/1191] wifi: ath11k: Avoid buffer overread in ath11k_wmi_tlv_op_rx() Date: Sat, 12 Sep 2026 08:57:09 +0200 Message-ID: <20260912065604.012058552@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260912065548.086904252@linuxfoundation.org> References: <20260912065548.086904252@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeff Johnson [ Upstream commit 9ef9dd30058cc9223c72f711dca1a28a5947d0c5 ] Currently, in ath11k_wmi_tlv_op_rx(), the firmware buffer is read without first verifying that the buffer has enough data to hold a header. This could result in a buffer overread. Add an upfront length check before dereferencing skb->data as a wmi_cmd_hdr. The check is placed before the trace_ath11k_wmi_event() call to preserve the existing trace semantics (tracing the full raw WMI event including the header), unlike the analogous ath12k fix which could use skb_pull_data() directly. Compile tested only. Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Assisted-by: Claude:claude-sonnet-4-6 Reviewed-by: Rameshkumar Sundaram Reviewed-by: Baochen Qiang Link: https://patch.msgid.link/20260716-ath11k_wmi_tlv_op_rx-overread-v1-1-0b972b3f1368@oss.qualcomm.com Signed-off-by: Jeff Johnson Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath11k/wmi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 2ce3f355ecac5..b2b69985dfcbd 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -8046,13 +8046,15 @@ static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) struct wmi_cmd_hdr *cmd_hdr; enum wmi_tlv_event_id id; + if (skb->len < sizeof(*cmd_hdr)) + goto out; + cmd_hdr = (struct wmi_cmd_hdr *)skb->data; id = FIELD_GET(WMI_CMD_HDR_CMD_ID, (cmd_hdr->cmd_id)); trace_ath11k_wmi_event(ab, id, skb->data, skb->len); - if (skb_pull(skb, sizeof(struct wmi_cmd_hdr)) == NULL) - goto out; + skb_pull(skb, sizeof(*cmd_hdr)); switch (id) { /* Process all the WMI events here */ -- 2.53.0