From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 D33992F9D89 for ; Sat, 4 Jul 2026 19:48:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783194525; cv=none; b=YDo5QZ5EJ/mREs+Em4vqZHKVFqU3jQY7sBK2FWcd+jkt3yJ3G4B8QQjNl5l0xO/nKgcjJqSTA6yoAyP06/RMquRIPY6rSiPN2ZmIyRZ2xN/oF3gNa+m01L8xfTKbZoA7Ukt84zBbGniIUW2EtDdnh4cn7S/u/lxn2l3yBhXJtf0= 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.47 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-f47.google.com with SMTP id 5b1f17b1804b1-493c5220cb7so11624295e9.3 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=YfakSay7LQ1cfIAABSlPD0iGJsvRubZuheTQTwgGV0N37NfNJcccL6gpc/oY5o2/T3 jLKRndl5edC4TvHHJ/3ARqP0yh3biO0qdDhTHVAV2ibOFs0Ek0u8pnwDMcLrH0QhNQYW iICsZOe5u0UNqJFPjN/2H25khL8EYCJ7HNWGGUqTpKotiznsvo4LfioBls+YV9qsOQOr BqUjsyewHkW8aReh9a4qDW1oq2AvJL+xslGt6LqB1q9FjGfzShml8b4qcHV18lHwpY/2 n+AK9j2tHTlKPY1iBTvP9mof5+a5TSOPxPMCYGHTDLhC2MpaSZrEdii3nh15iK+4TurB sEWQ== X-Forwarded-Encrypted: i=1; AFNElJ8EGgFGqKLl3IiPYUfk5cdDUnzaNlOBYgYSVr6tqesdCW2I7TZh+kYjCdV4GqHFg4SWY5BU0q4uhV/9FFg=@vger.kernel.org X-Gm-Message-State: AOJu0YydWAsmrvDyVeSwBdMB8MfcOpYOdlY2hodV4CCqIBcC7jRJipPV rbOsH3zvFB8ItzGsQrbmRoQPmjQqLmSC1Nmcs4mjx4s7KwDAa97E3YNA X-Gm-Gg: AfdE7cmr5ly51ONXv8usiX5JsyGiwm+AhJBuvLeNrUwNMaWY7uR72sA4qCFWhFGmpJl dXOxLtyIgpcX3Wye9TPF721fypA/zu+4M+TFBFvGBdHCzCnm7jBV0TDcFT7HNzyAX8FhU+8gLMn JFPTEBl2268eHjpQVXi2Er+KXS5gQqX6LUBEINk+4r5nt+V4sZgR+IJ1RHnzPKMR6dVbX8wlV7E kDv0vQeDP6VEPoCp27O6kSBaQioIUaMW3NVyNYQdydhNf1Dpq0hhX0KvgpJ0x111HP0Zb7j2no4 LG0l9eSMr0skFHo57unxgwgHRtGJPDrIB/E4by+ensPIcMYaIoerBpVRmaK0N18iMa9+9WksxHm is4BMJGvKm1YpZShcAPIF8XlaAC1iFSgbMeTRRD9gH4gAWLoinLQ4RvBZomQx9td+s/q720eZaS H7TP42m7v2DP6bF2GfSqMYWuLzveSoxesTs4ZMzznLTBgdVdpqtyHbc1nVYaCrVNn/F23zsZWbg EZGPg7BVu0= 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-kernel@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) {