From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 7319E194ACC; Sat, 12 Oct 2024 11:27:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728732445; cv=none; b=iCd9I2K5pcMzcyrf+R38/EidN3v7Mw+dstqk3CdsUn1pOQrgrEniWx0d//5ysf2fH37/3+92mD8KQQbt1T9G9vq8oZN0jnT38AmmdmYjsrUFurOmwEdcNJ5yrrsPrMFJ+J8ikhJMWFSEyEXB0YwW0qzWQX/ZFy/00hxG0Cv/7d8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728732445; c=relaxed/simple; bh=9r/O/dswXk/5RkreAaB9f5SvarXl/nHMYeYvW80dEcA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CXBi02LThFXa9OaoMiE6VqLTx06WdRUSiIVqLdoFADdEuqHZ3ijAR9W5P6dM+s/1/UJLmA+vwRoYErqbmeKqcglR0kRxKKulX8wHucMMHtezFpx5fQith95LWx7d3le/CusecbFAVSn3H80ZQ5649qPxfVbh1s33+7WIRi2+bTc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZMkD5aTk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZMkD5aTk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 06961C4CEC7; Sat, 12 Oct 2024 11:27:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1728732445; bh=9r/O/dswXk/5RkreAaB9f5SvarXl/nHMYeYvW80dEcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZMkD5aTkxuOWA2Y48K6NnsbK3iyN4O3f3sU+v0LaDruZd/R4pu7ApYgJVdVOAs0Vm ifhUoDmMJBEb3QPtS0FpkZie961TbK2nqEl576pNl5OX7U0cBJbkvHT1H8v0JK9a3P Aatb8nRQx6IteSmkwTstIm2Xc2/KSP9Q3Ynb0kBXowVKYmL9wJQeyTuFOZTest5Z6w snmPPX9No/Dnw0Ni3K/viNyshvkr9I3DH61F5GdekuwtV30qFeU9rWNcmhKQDMKUfz gV39JhqOgG2lphjczvaz+b2QnuIynDHNkPEeP7mWgALRlOhPtOjgKgEjOiRPPJU1cN 27+s8wnhGD1Pg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Foster Snowhill , Georgi Valkov , "David S . Miller" , Sasha Levin , edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, oneukum@suse.com, linux-usb@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 04/20] usbnet: ipheth: remove extraneous rx URB length check Date: Sat, 12 Oct 2024 07:26:36 -0400 Message-ID: <20241012112715.1763241-4-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241012112715.1763241-1-sashal@kernel.org> References: <20241012112715.1763241-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.56 Content-Transfer-Encoding: 8bit From: Foster Snowhill [ Upstream commit 655b46d7a39ac6f049698b27c1568c0f7ff85d1e ] Rx URB length was already checked in ipheth_rcvbulk_callback_legacy() and ipheth_rcvbulk_callback_ncm(), depending on the current mode. The check in ipheth_rcvbulk_callback() was thus mostly a duplicate. The only place in ipheth_rcvbulk_callback() where we care about the URB length is for the initial control frame. These frames are always 4 bytes long. This has been checked as far back as iOS 4.2.1 on iPhone 3G. Remove the extraneous URB length check. For control frames, check for the specific 4-byte length instead. Signed-off-by: Foster Snowhill Tested-by: Georgi Valkov Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/ipheth.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index 6eeef10edadad..017255615508f 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -286,11 +286,6 @@ static void ipheth_rcvbulk_callback(struct urb *urb) return; } - if (urb->actual_length <= IPHETH_IP_ALIGN) { - dev->net->stats.rx_length_errors++; - return; - } - /* RX URBs starting with 0x00 0x01 do not encapsulate Ethernet frames, * but rather are control frames. Their purpose is not documented, and * they don't affect driver functionality, okay to drop them. @@ -298,7 +293,8 @@ static void ipheth_rcvbulk_callback(struct urb *urb) * URB received from the bulk IN endpoint. */ if (unlikely - (((char *)urb->transfer_buffer)[0] == 0 && + (urb->actual_length == 4 && + ((char *)urb->transfer_buffer)[0] == 0 && ((char *)urb->transfer_buffer)[1] == 1)) goto rx_submit; -- 2.43.0