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 2593E188A0F; Fri, 23 Aug 2024 14:06:43 +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=1724422003; cv=none; b=ofpRShC+aDpp26RemBUPe+rHqjlBfRa8KZ+kPuw3yhjdJ67o1+b31dE2SqfVUck5jnPDIv0Kfgsh4q0i1Nb0IepU4CG0zsJ8r2IKAf6bZkHuNpZdMAh793q/nMxheAzjQFCNfDt4MILspChG11RTcXjUJcP7sRxoLoREISkqzvY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1724422003; c=relaxed/simple; bh=Nb2BbHq+1efjpAn+GbZjGdJrBasAPm8DiOu7LApyvV0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qzUeNPuEQ+5WvSXg90KgyP0qs/fAeuuxP1l5spIdqStpavhnr/6NxUQB4+Fy+KleaN0WR6mivj8ZDOEiBkMqANFZXbQK5+YrgoqRY1ctTdAYfEHPlTvDQj9bPGUhmIlH3Nx8KGjZPk5s2MoQ4KkJJjG/M4nXlGbhpz5jMhWQiCY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cdfn/RJK; 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="cdfn/RJK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A62A7C4AF09; Fri, 23 Aug 2024 14:06:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1724422003; bh=Nb2BbHq+1efjpAn+GbZjGdJrBasAPm8DiOu7LApyvV0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cdfn/RJK72HU0c+HHFGujOd/WndJgGSA6ABwf3tEJHnzNRr+wlDrLnQTUPQOnYK33 f0PoOmxOFkXwRB/Cb0gpH7ZuMU4XaEIrMQjCfqeS5VwtKq+2QOKcv7hURKLrghN5w8 jEETIyufTINQJ0oV6TipCd/0YCR+ODxJkt1VTopoNPSOCxcAWA5QS+TFMbcMVdIhCe V0wHn9HwOmT43UirQpz0rxDitFY+NaThEptzeTgW7IJv6zADin34MlvBVriNLLczlk Lv7tq4V5pKm2y45YtojqL20KZbEm6Kkdkl/axVQRehJ+GVS65tdcAO1VVbnOlYtzOn kigohmFDPNSgw== 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 4.19 2/6] usbnet: ipheth: fix carrier detection in modes 1 and 4 Date: Fri, 23 Aug 2024 10:06:23 -0400 Message-ID: <20240823140636.1976114-2-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240823140636.1976114-1-sashal@kernel.org> References: <20240823140636.1976114-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 4.19.320 Content-Transfer-Encoding: 8bit From: Foster Snowhill [ Upstream commit 67927a1b255d883881be9467508e0af9a5e0be9d ] Apart from the standard "configurations", "interfaces" and "alternate interface settings" in USB, iOS devices also have a notion of "modes". In different modes, the device exposes a different set of available configurations. Depending on the iOS version, and depending on the current mode, the length and contents of the carrier state control message differs: * 1 byte (seen on iOS 4.2.1, 8.4): * 03: carrier off (mode 0) * 04: carrier on (mode 0) * 3 bytes (seen on iOS 10.3.4, 15.7.6): * 03 03 03: carrier off (mode 0) * 04 04 03: carrier on (mode 0) * 4 bytes (seen on iOS 16.5, 17.6): * 03 03 03 00: carrier off (mode 0) * 04 03 03 00: carrier off (mode 1) * 06 03 03 00: carrier off (mode 4) * 04 04 03 04: carrier on (mode 0 and 1) * 06 04 03 04: carrier on (mode 4) Before this change, the driver always used the first byte of the response to determine carrier state. >From this larger sample, the first byte seems to indicate the number of available USB configurations in the current mode (with the exception of the default mode 0), and in some cases (namely mode 1 and 4) does not correlate with the carrier state. Previous logic erroneously counted `04 03 03 00` as "carrier on" and `06 04 03 04` as "carrier off" on iOS versions that support mode 1 and mode 4 respectively. Only modes 0, 1 and 4 expose the USB Ethernet interfaces necessary for the ipheth driver. Check the second byte of the control message where possible, and fall back to checking the first byte on older iOS versions. 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/usb/ipheth.c b/drivers/net/usb/ipheth.c index c762335587a43..43db0f37f1951 100644 --- a/drivers/net/usb/ipheth.c +++ b/drivers/net/usb/ipheth.c @@ -307,13 +307,14 @@ static int ipheth_carrier_set(struct ipheth_device *dev) 0x02, /* index */ dev->ctrl_buf, IPHETH_CTRL_BUF_SIZE, IPHETH_CTRL_TIMEOUT); - if (retval < 0) { + if (retval <= 0) { dev_err(&dev->intf->dev, "%s: usb_control_msg: %d\n", __func__, retval); return retval; } - if (dev->ctrl_buf[0] == IPHETH_CARRIER_ON) { + if ((retval == 1 && dev->ctrl_buf[0] == IPHETH_CARRIER_ON) || + (retval >= 2 && dev->ctrl_buf[1] == IPHETH_CARRIER_ON)) { netif_carrier_on(dev->net); if (dev->tx_urb->status != -EINPROGRESS) netif_wake_queue(dev->net); -- 2.43.0