From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A049A3D88EA for ; Tue, 21 Apr 2026 13:49:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779376; cv=none; b=hlbMa/Y9MVWPYsvAcWU0cRKGVMBkbjrMapZBwbYjkBvVYN4lLorNEzWd47YwleRboxd78EUNfll6zxjqe7joL8mkiUct7JdpYNr8EQclg9T5CerTSzAoZr8y0R0BWAMAsFwoFKBhARC+FO8H33JWzlkUlCrGUwqtbMQseRWmwlE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776779376; c=relaxed/simple; bh=kYvWMaR/h7jQFecF2mQH90g51Vwmu+kwPEDpTh4He54=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VIXXVAoDV9qQ9WFMPKNsEwGVzLPv1PdXvCYNurzKG89YPMXdmfg3VzZK8nlxpAOBk4bVBL8aq/LToZKVO2xfn6OgJ7s4QKGNdPSXEeGTvUpdXETP8HSBX5wb/4CguNK7Y3v9vsnLZXKGOvNi5sAw8WVqN8hJPPHxd+v2VQs8iUU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=enzZt690; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="enzZt690" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-488e1a8ac40so54572895e9.2 for ; Tue, 21 Apr 2026 06:49:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776779373; x=1777384173; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VkPIrWAw2BJnj1bF5bBeqq1kiMLomS8oH1yW25eMUD8=; b=enzZt690wIPTv8rUnsAFMXS8anbekKv5SfZ6ttWmeKmxORRtH697jxdLj5xN1oQMH4 2t27rlT4/iCOGYmnYIhQ3rgK/i55ehAmZhh2kXy4IQK+5hibGipTALO+IoPqdB24id3e s84MFWWIHmPmPvCwUDhxtpC9gEWGE0cTbFNGEHpraYWUezYKVMngiZnxlH6ZmvaFrJRc NuQnLUqgdX0Bvsb5kThFeRNm/EzYmNztqxrWmhxdUjUOnYVz5aPm0udHr5wHPEnO7XjN awx+gQ+7zdhljwzXfo8Q69tRkpNV6TRXdTxHNJLGaptC35QofJhIf136Imcx7fCFmWM4 qixQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776779373; x=1777384173; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VkPIrWAw2BJnj1bF5bBeqq1kiMLomS8oH1yW25eMUD8=; b=PjcZJl/A6pRVFDiJVQkcYDc+Wc+EvhAUBsIwyAfWuNmKGEPeoj9/NjnVSeYWPw9VG3 7uxhbCI8pAFDKaGao7EEIVfuBYOX4fi3RMEejXaSizEAj/vmy9+l2JhguiOEIkX2B5hR DTx4atpk5Ey+i6j3eCYFBMtWc+EEqO1QXS7wpEwmEUch/wfywSCHG5N1zPoDy/ydI9ni x1MA1tCuGYX4nJwK+uMXePU4svAk4WD6AeoKJhFRQwVZ+FQOWYGZXMygovcVA+kiW1FG xqHiogmntSyePDdp9+qC4WuJ12FTRo6JmjgZ0RzQz19A0KKjcxWVfCbiqXZbQiAyhCOS Gi4g== X-Forwarded-Encrypted: i=1; AFNElJ8f9uhCeiX4aFkYtNqAXKg53t+7C5ZweKGkBVm+rvXrfItJfiYNSsVkuXY2TYAbLB3sWrAw/a7/O0InDaE=@vger.kernel.org X-Gm-Message-State: AOJu0YxPhsaak3UrLQljGg5vNbFrZLIlkX3bY9gnS/Wzxafiq+KHMIk5 yLJ3wBqTWYXbck+khckuVZMhDctLUeW0HwglkEYKtqNsiEAvDgWDxW0= X-Gm-Gg: AeBDieuQIpjW8KiZ3Yjzv63lhuUPI0RfGt8VOjkGlW0tkR/mmT1WxlhQZX/45w7klcp UqUC0vMmxVVG6gpTj/5RKT+hJvA7D47AvNqtP6ajy15v+AKcKGGoQvVYCe9gEYdTk1h8yUOtMC/ gjgInTWFWGgDNyDX5LSunAMyYeV4wtqmskvE+4urMuvAiG9MzDTV75LxE6EBLdkQJrRISDMaK2r +gIdG/z6bKUwbf8JW84WZHB3i3nkjUinKfxPK2Oaks+9wNOu2Qyg6KBYl/8QeOuvnyjv3YJx5lc yv3wLW+yTWWpfjWq+9BaEVNZAxTWb236r6SUL9v/o/vJ/IVPADrDqY7uHsIckKHyP2/WXJL5ykp 4iXzHPuNxCHBQzjD1uvNLYhNiq239UcKJbaeGkhSb+9+QDJ5VYaMVEbwnecfFtQgrBWpfRPbMjI j9yJ0= X-Received: by 2002:a05:600c:c090:b0:488:9e54:94c0 with SMTP id 5b1f17b1804b1-488fb74e130mr187792215e9.8.1776779373034; Tue, 21 Apr 2026 06:49:33 -0700 (PDT) Received: from debian.. ([2001:41d0:303:db6b::]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4891c318636sm168157785e9.7.2026.04.21.06.49.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 06:49:32 -0700 (PDT) From: Tristan Madani To: Christian Lamparter Cc: Johannes Berg , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani Subject: [PATCH v3 3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path Date: Tue, 21 Apr 2026 13:49:28 +0000 Message-ID: <20260421134929.325662-4-tristmd@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260421134929.325662-1-tristmd@gmail.com> References: <20260421134929.325662-1-tristmd@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Tristan Madani The failover continuation in carl9170_rx_stream() copies the full tlen from the second USB transfer instead of capping at rx_failover_missing bytes. When both transfers are near maximum size, the total exceeds the 65535-byte failover SKB, triggering skb_over_panic. Limit the copy size to the missing byte count. Fixes: a84fab3cbfdc ("carl9170: 802.11 rx/tx processing and usb backend") Signed-off-by: Tristan Madani --- Changes in v3: - Regenerated from wireless-next with proper git format-patch. Changes in v2: - Use min_t() instead of separate if-check, per Christian Lamparter. drivers/net/wireless/ath/carl9170/rx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/carl9170/rx.c b/drivers/net/wireless/ath/carl9170/rx.c index f6855efc05c0f..ccadc46385240 100644 --- a/drivers/net/wireless/ath/carl9170/rx.c +++ b/drivers/net/wireless/ath/carl9170/rx.c @@ -918,7 +918,9 @@ static void carl9170_rx_stream(struct ar9170 *ar, void *buf, unsigned int len) } } - skb_put_data(ar->rx_failover, tbuf, tlen); + skb_put_data(ar->rx_failover, tbuf, + min_t(unsigned int, tlen, + ar->rx_failover_missing)); ar->rx_failover_missing -= tlen; if (ar->rx_failover_missing <= 0) { -- 2.47.3