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 3B5D74FD7B8; Thu, 17 Sep 2026 17:06:48 +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=1789664809; cv=none; b=asE5FJMC9X0agWifNhWYJZKsIc9ppQqkpXVNq8hnqM317vl0G+WkMNZtnkShExD5WjHlTNfELKXWN4Chg+D1ZvhbNSyWmsiTXoEfX1oY6kCKuFZSEMnS8y3OpUnv5J1i2zGKa2BEGs1QC/1uQL02ihgOIpT6GT2uoxinIBZlgjU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789664809; c=relaxed/simple; bh=MDeEXuiUcIdH7qxiU55i92v7mS6AokpBJRYl7k6U4+8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFJJteNr2A39TEXSv76msudLYRDVnblQnogoDtbCejQXGDcnLOp0kpEka2FqkysuytOh4He7iDb+V2KCw9c5i2ukdG1Gqy7Tfl86YXQHMO6o0konk4wA8M5I3RfKOnJbAbkZYk5JDeVL3nElpnsnyLk0X/hlg+0lDIwZasSro3Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=OSug/qIS; 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="OSug/qIS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 94CC91F000FF; Thu, 17 Sep 2026 17:06:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789664808; bh=HW/D5PAsUYR63ncPcGxIOw98g0/H/lL/JcHmBdZddSg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=OSug/qIS9lPuhuO9vcG0tmOwAqck+kjs1xCDDk58gAlvkoePpb5aGPAH8P42LTTcy rYPSWHFYFuJ6+v27aGb5ogmm945iobtE74F4f5jWEy42e9Ic1quif7fbpp0nOgAXYE VIqAIClg/cnB6CvQjUhW/hiQFWiZX5LJOGTY+cyA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pengpeng Hou , Johannes Berg , Sasha Levin Subject: [PATCH 6.18 0495/1250] wifi: libertas: reject short monitor TX frames Date: Thu, 17 Sep 2026 16:04:50 +0100 Message-ID: <20260917151605.381722716@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151551.901433442@linuxfoundation.org> References: <20260917151551.901433442@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pengpeng Hou [ Upstream commit 13ff543e0b2c713aedeaadadde686686e949dc78 ] In monitor mode, lbs_hard_start_xmit() casts skb->data to a radiotap TX header, skips that header, and then copies the 802.11 destination address from offset 4 in the remaining frame. The generic length check only rejects zero-length and oversized skbs, so a short monitor frame can be read past the end of the skb data. Require enough bytes for the radiotap TX header and the destination address field before using the monitor-mode header layout. Signed-off-by: Pengpeng Hou Link: https://patch.msgid.link/20260704011140.37639-1-pengpeng@iscas.ac.cn Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- drivers/net/wireless/marvell/libertas/tx.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/marvell/libertas/tx.c b/drivers/net/wireless/marvell/libertas/tx.c index 27304a98787d6..13d08022e4141 100644 --- a/drivers/net/wireless/marvell/libertas/tx.c +++ b/drivers/net/wireless/marvell/libertas/tx.c @@ -117,6 +117,13 @@ netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) if (priv->wdev->iftype == NL80211_IFTYPE_MONITOR) { struct tx_radiotap_hdr *rtap_hdr = (void *)skb->data; + if (skb->len < sizeof(*rtap_hdr) + 4 + ETH_ALEN) { + lbs_deb_tx("tx err: short monitor frame %u\n", skb->len); + dev->stats.tx_dropped++; + dev->stats.tx_errors++; + goto free; + } + /* set txpd fields from the radiotap header */ txpd->tx_control = cpu_to_le32(convert_radiotap_rate_to_mv(rtap_hdr->rate)); -- 2.53.0