From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (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 D0A0E2E2DD2 for ; Sat, 4 Jul 2026 19:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783194525; cv=none; b=l7Zoq1NVXlPHJY6Tyfn5D5ikwTGIcv8SA90E8+zzHjGUI35Z4PBXob1BXsN6d/mm3v9k+w8W/aDzcHlqBJO0pcaWZHzlQnLr3fakBWukBAvARm5Rtb+VVTRI4yxjZ0JlRmTSo+OXGtqK+9xMPPpPxr9hdbYVtSumFqEqi14PxKQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783194525; c=relaxed/simple; bh=DjnuPL2bW88foM2JsjICeRBHpRdyyJm2pS00YULmmkU=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SfoSulWlA97pZ1PeTpFNsBw+Xv6uJWDjYm17bGE1fkc+LQcquQXY3XAM9jsuC5wDhMcvktX/TZHz5g7Z7aWq5MbC72/y6AjZdgjAjURXmlO5/vw4X1YabPvQeojc6Wp305WVwl79SVJqNi3qq3x8i9p0/LcbO7+flUISMXmrmYg= 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=SPTLu0Ca; arc=none smtp.client-ip=209.85.128.41 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="SPTLu0Ca" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-493bc8fda98so17885535e9.0 for ; Sat, 04 Jul 2026 12:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783194522; x=1783799322; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=jajvi8AVqAQfTHFADtWCFML6DSVMe8XFUK0J1hsMK+M=; b=SPTLu0CafzNMLpgd75gJ/8j5hUFQP+S/b0OolPxvK7xQwvSJySBYt365+dTPY3ff/F i86gPeaqp9TGiI5bQySk97/O++ZptIFGpWTI9hZ96YdsLG01ki/p7mwqQ99Wb7wRW0sA QEyTfBkUPg0tFJiF0DWdLbsAUuIQv6UUN6iWmX/ezNlM1UDc4llB00w0cmVnc1R6ZkPw ioKnaCSvHpEzVj3X2BynPMTd9ukYsexVxidfZYs3p8gB5eOwaNnXH+xn3XWojz+G3CHW N7rWJhNV7bOOoPhLjMhBM8tSNWHL4NHDl/OAAyYDpMknMsM8LbAjXMfJC/37rO2bQE1h RePA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783194522; x=1783799322; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jajvi8AVqAQfTHFADtWCFML6DSVMe8XFUK0J1hsMK+M=; b=nOmJ4EVbo6jVnCboHvFjlZrScXe4QALgvjnjNemGx1AGVR1WOR68x8qjITtc3/rHjk cdBbwqxv5t/uBN8jouggC+mCLAZ/4WJE1FdgCo1oVT4nbpZwfqfMYQZ3oIGESVh9SKI1 Fl+Tm6q88l8QvV1cIzwwGZk4GjDMMxOk/GonlOXsw3CoHz62BCQIva+/Lg7whSQJX4vJ FiFED4vSfG/xCn4nLmxtJxzlutJMvgvEEnTp807FT+s8KLEyWdotjrSP54ChZ2i4MMTV LVduIzKhs/VL9ZZwk0TH3sD+zXQfMq/tSYKBvjrdWIjhKzclS5ZGekay7LO9fQm4hH4r c/aA== X-Forwarded-Encrypted: i=1; AFNElJ8pz/xfhX7Hf6VAtocNIgwRtm05hXLUkYiFru5Sq8M8gBjRquoSAAjauvpetDDDv7L4qVHIzshkOODLoDGB7A==@vger.kernel.org X-Gm-Message-State: AOJu0YwVGidZA7E4UiyBZD1p2q4I/e98M0C7a2uX9X5CnshrReEzhxiX eSkMbOK36wospYy8r+K54mXwENlclWZZpAikQ+RK0dx77iw/agfLpetwysk6AQ== X-Gm-Gg: AfdE7cle/4vUxLLlutOv1GRoFLajzybht4uiVZMV1NbKSr5IgFjhhlKyStPZhlhoAWq VhyaarwFBNig4fl8h1QeETQJuW4qoe1XxvaNMCMORohaVvChDUQcn8DqQGuc6rCT7v24FPWRPRB 9oPVzbOmKa9q7b9ssrWc9/TOalC8ZYFSsv7qKRTaxRg/SSLt58H47Z0L+xIpDmlgVX8Ao8px9G/ znmMaKtTDhS6JbbTkuhGpRHKIAyN+lSGJeHRodQwdFptFFv8rzDhBmbB99CeTCEzRvDgnrnjJ9M DsZ+B/Xz215Pu1dD038oloeA0HiH6y/XYeBLWqQ7M9OjzP90T0HLzy+l62tNVHlsupY/1zsq7BQ tuFrksZ89wOLVCBIAOLdc8zGiUC3sYE252GY/QNwd/lczw+Pxg0RetYwRTFH0Lm5jNMwadtveYL wb0Ycbj7NYcCU0Wao1kqx2KQUQGcnMu7h/r8szNpfBLO8W0Qo/gf52VrYrq8nO/yGlE6zlKCo6d +7a8fRNzfM= X-Received: by 2002:a05:600c:5487:b0:493:c389:d436 with SMTP id 5b1f17b1804b1-493d11d7b91mr48863315e9.9.1783194522196; Sat, 04 Jul 2026 12:48:42 -0700 (PDT) Received: from shift (p200300d5ff229f0050f496fffe46beef.dip0.t-ipconnect.de. [2003:d5:ff22:9f00:50f4:96ff:fe46:beef]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47aa039ae4fsm10649869f8f.18.2026.07.04.12.48.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2026 12:48:41 -0700 (PDT) Received: from localhost ([127.0.0.1]) by shift with esmtp (Exim 4.99.4) (envelope-from ) id 1wg6Lw-00000000Joz-1u1n; Sat, 04 Jul 2026 21:48:40 +0200 Message-ID: Date: Sat, 4 Jul 2026 21:48:40 +0200 Precedence: bulk X-Mailing-List: linux-wireless@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 3/3] wifi: carl9170: fix buffer overflow in rx_stream failover path To: Tristan Madani , Christian Lamparter Cc: Johannes Berg , linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Tristan Madani References: <20260421134929.325662-1-tristmd@gmail.com> <20260421134929.325662-4-tristmd@gmail.com> Content-Language: de-DE From: Christian Lamparter In-Reply-To: <20260421134929.325662-4-tristmd@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/21/26 3:49 PM, Tristan Madani wrote: > 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 Acked-by: Christian Lamparter > --- > 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) {