From nobody Fri Dec 19 21:55:53 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 B7BD526B0A9 for ; Sat, 8 Nov 2025 09:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762592484; cv=none; b=sIUM3cBXLFcUlQdYgwKmIVKUUitx+giObNithjmkzJfc+1J5YFOU2mUy7ONCQ2sHBm6Ke6ARVM9xRJ8a2pCtdzwCaPqdEx3TGttl0xNeyXqVWskjSvkk2zdWzL4QrNLj3GzPl48/LRpXoKjyMy5JrL9itM+bfMg0YV/V20Nh8RM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762592484; c=relaxed/simple; bh=WDo4TwHFuj3APKAWzS/6lAjFmaMs6k2odG1LKzll5U8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=eALTC3Mw85mFHWGz6xFj82nEaQYjyt+10vn4GCHTHUozBPYeBbKf4HVaH5AiA3UkzMvVT6YAt2rV05lehiAwedYIfJ82l7QKDqdIiXLIMDgbZpzqPRtxJTGasJP4AsaAuj/q3a1kS+C0Jxepk9y1Udeg7R4bSEI8dPsBseXZyV4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vHeor-0004vh-Sr; Sat, 08 Nov 2025 10:01:13 +0100 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vHeor-007fMA-0i; Sat, 08 Nov 2025 10:01:13 +0100 Received: from hardanger.blackshift.org (unknown [IPv6:2a01:4f8:1c1c:29e9:22:41ff:fe00:1400]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id 80F5349A89C; Sat, 08 Nov 2025 09:01:12 +0000 (UTC) From: Marc Kleine-Budde Date: Sat, 08 Nov 2025 10:01:01 +0100 Subject: [PATCH can 1/3] can: gs_usb: gs_usb_xmit_callback(): fix handling of failed transmitted URBs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-gs_usb-fix-usb-callbacks-v1-1-8a2534a7ea05@pengutronix.de> References: <20251108-gs_usb-fix-usb-callbacks-v1-0-8a2534a7ea05@pengutronix.de> In-Reply-To: <20251108-gs_usb-fix-usb-callbacks-v1-0-8a2534a7ea05@pengutronix.de> To: Vincent Mailhol , Maximilian Schneider , Wolfgang Grandegger Cc: kernel@pengutronix.de, linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Kleine-Budde X-Mailer: b4 0.15-dev-509f5 X-Developer-Signature: v=1; a=openpgp-sha256; l=1610; i=mkl@pengutronix.de; h=from:subject:message-id; bh=WDo4TwHFuj3APKAWzS/6lAjFmaMs6k2odG1LKzll5U8=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBpDwbSYL15v69rk/i42dmmgvx/06CTSKRb+jPM6 Z55z5KEg86JATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaQ8G0gAKCRAMdGXf+ZCR nHL3B/9JnmNiWxX6AoSYPL2qw6EZQVr9cJOhgr41dv1w5V4cIeVOwaWPhdQB6MpsVPAO634W9Vg XkD8IBOQaiXh7e610/z+LqLiz+K2GI1jAc4CaIsmGWZQbocwYkhyJ67B22qpceT6Xfe/bMB60aL dpEsRw9QFx2szOnnBQAgYD2AYVgwPcL1SKICCwsk6ACSC5xstjZLBTSZWglyWGJwxeLBjDriG6b 2A9b5Uf3RTcufwIJBSDI7iEGAEplLx5CviOuEHKAe2Js2WPC5zUZmizJpuwB6bqmE8kleDlyJ9n UmzDki+2AQtpO3ivJ/r37lEB8E8TVj21b3d3gkmcObY2QyJy X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org The driver lacks the cleanup of failed transfers of URBs. This reduces the number of available URBs per error by 1. This leads to reduced performance and ultimately to a complete stop of the transmission. If the sending of a bulk URB fails do proper cleanup: - increase netdev stats - mark the echo_sbk as free - free the driver's context and do accounting - wake the send queue Closes: https://github.com/candle-usb/candleLight_fw/issues/187 Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices= ") Signed-off-by: Marc Kleine-Budde --- drivers/net/can/usb/gs_usb.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 69b8d6da651b..fa9bab8c89ae 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -750,8 +750,21 @@ static void gs_usb_xmit_callback(struct urb *urb) struct gs_can *dev =3D txc->dev; struct net_device *netdev =3D dev->netdev; =20 - if (urb->status) - netdev_info(netdev, "usb xmit fail %u\n", txc->echo_id); + if (!urb->status) + return; + + if (urb->status !=3D -ESHUTDOWN && net_ratelimit()) + netdev_info(netdev, "failed to xmit URB %u: %pe\n", + txc->echo_id, ERR_PTR(urb->status)); + + netdev->stats.tx_dropped++; + netdev->stats.tx_errors++; + + can_free_echo_skb(netdev, txc->echo_id, NULL); + gs_free_tx_context(txc); + atomic_dec(&dev->active_tx_urbs); + + netif_wake_queue(netdev); } =20 static netdev_tx_t gs_can_start_xmit(struct sk_buff *skb, --=20 2.51.0 From nobody Fri Dec 19 21:55:53 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 D581A265CCD for ; Sat, 8 Nov 2025 09:01:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762592483; cv=none; b=nIsKYXIkwNJfKQW3p3d04EteO9EB+Q+CBkEUDuskHuEVB5YVtBOos1y5Y93k7yLhiH6j7//Pw421RcR1JJIKswqE75d/57RdNkjkkJLuTeyZ3kI7TfNh8CCUNNTcessUj1dzS7lUxxtXwJMys9XQTBmZoVMnpYbSm9OfR1pzgqA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762592483; c=relaxed/simple; bh=7fNx/AX63/lcrl0SzWFf1gLEWkW0J5hkOQiArbLfdHc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gViG606yd/nt0VpD09nt77yCt+Cm7qlKAI7vI6psUAIDz8yzC011MOBdewpJNMwn2QqeqRl+jW0TLWSAq4OmkqvCpcqkD1Orv1ll+XjLBQSFB5aJx18t5FUUOU33Y6ARh0yEniBzD2H3fzkFe5fHkJXRqUdlTICbFPdlj/bhg9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vHeos-0004vs-1d; Sat, 08 Nov 2025 10:01:14 +0100 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vHeor-007fMD-2g; Sat, 08 Nov 2025 10:01:13 +0100 Received: from hardanger.blackshift.org (unknown [IPv6:2a01:4f8:1c1c:29e9:22:41ff:fe00:1400]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id 28FC949A89D; Sat, 08 Nov 2025 09:01:13 +0000 (UTC) From: Marc Kleine-Budde Date: Sat, 08 Nov 2025 10:01:02 +0100 Subject: [PATCH can 2/3] can: gs_usb: gs_usb_receive_bulk_callback(): check actual_length before accessing header Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-gs_usb-fix-usb-callbacks-v1-2-8a2534a7ea05@pengutronix.de> References: <20251108-gs_usb-fix-usb-callbacks-v1-0-8a2534a7ea05@pengutronix.de> In-Reply-To: <20251108-gs_usb-fix-usb-callbacks-v1-0-8a2534a7ea05@pengutronix.de> To: Vincent Mailhol , Maximilian Schneider , Wolfgang Grandegger Cc: kernel@pengutronix.de, linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Kleine-Budde X-Mailer: b4 0.15-dev-509f5 X-Developer-Signature: v=1; a=openpgp-sha256; l=2432; i=mkl@pengutronix.de; h=from:subject:message-id; bh=7fNx/AX63/lcrl0SzWFf1gLEWkW0J5hkOQiArbLfdHc=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBpDwbTOzrOuARzT/lDlpR+lSbwNflicIZOAXng2 H8nFZjrFciJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaQ8G0wAKCRAMdGXf+ZCR nKJ3CACtLg7J3tsHLkZGor/lgOHPs24LaLTRcR4lK7lOWSvzMnuDz2Nemg+JWBfgksjM276YXDN 3qqOygXrkEZuySWr7vIhMEU3j8AonJ7j6udm16RaF79Ldv1CwtErZlfPkp9YcS0wS+HlLFIc3KJ AYR4GuV4cSJrW60alJ8eQcTUN4SUULnIEQ7VvACfMzWzvMJoc2xDGxtnP7Zv+SOLIyB6uJD+Cef YNCnFMAnNQofz/EPkaw+KjKCXwq/bli0sUrQAtb+aKY8IDTtZmbUitASwOBjsmnlf21vu3PFO2L 7oeSrXDEoOI9Y40U95jQ9W3MVv961yTqUG8SUXOoXGNomm87 X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org The driver expects to receive a struct gs_host_frame in gs_usb_receive_bulk_callback(). Use struct_group to describe the header of the struct gs_host_frame and check that we have at least received the header before accessing any members of it. To resubmit the URB, do not dereference the pointer chain "dev->parent->hf_size_rx" but use "parent->hf_size_rx" instead. Since "urb->context" contains "parent", it is always defined, while "dev" is not defined if the URB it too short. Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices= ") Signed-off-by: Marc Kleine-Budde --- drivers/net/can/usb/gs_usb.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index fa9bab8c89ae..51f8d694104d 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -262,13 +262,15 @@ struct canfd_quirk { } __packed; =20 struct gs_host_frame { - u32 echo_id; - __le32 can_id; + struct_group(header, + u32 echo_id; + __le32 can_id; =20 - u8 can_dlc; - u8 channel; - u8 flags; - u8 reserved; + u8 can_dlc; + u8 channel; + u8 flags; + u8 reserved; + ); =20 union { DECLARE_FLEX_ARRAY(struct classic_can, classic_can); @@ -576,6 +578,7 @@ static void gs_usb_receive_bulk_callback(struct urb *ur= b) int rc; struct net_device_stats *stats; struct gs_host_frame *hf =3D urb->transfer_buffer; + unsigned int minimum_length; struct gs_tx_context *txc; struct can_frame *cf; struct canfd_frame *cfd; @@ -594,6 +597,15 @@ static void gs_usb_receive_bulk_callback(struct urb *u= rb) return; } =20 + minimum_length =3D sizeof(hf->header); + if (urb->actual_length < minimum_length) { + dev_err_ratelimited(&parent->udev->dev, + "short read (actual_length=3D%u, minimum_length=3D%u)\n", + urb->actual_length, minimum_length); + + goto resubmit_urb; + } + /* device reports out of range channel id */ if (hf->channel >=3D parent->channel_cnt) goto device_detach; @@ -687,7 +699,7 @@ static void gs_usb_receive_bulk_callback(struct urb *ur= b) resubmit_urb: usb_fill_bulk_urb(urb, parent->udev, parent->pipe_in, - hf, dev->parent->hf_size_rx, + hf, parent->hf_size_rx, gs_usb_receive_bulk_callback, parent); =20 rc =3D usb_submit_urb(urb, GFP_ATOMIC); --=20 2.51.0 From nobody Fri Dec 19 21:55:53 2025 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (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 B7C512DF3D1 for ; Sat, 8 Nov 2025 09:01:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762592484; cv=none; b=hVbd562OH4Pa4SzWYb/AcvpPvQUvOu54ZjRjKtWYZyPw/rvnrfF4CkNO7WRHtnc2BiNcDXBlAIoQmnn4xzfywdx4OYN2ch+lijkhyLl2A0MhI6IOXK4lIgKrEWYRsujeVBqhja4mweOoiQi7Y3viFsFNZYvyM1Mcxc9p/U4Kmk0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762592484; c=relaxed/simple; bh=ISveydnAGqHXLegHAkh7CeD6kEHV3cPFgoiC794xNh8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=USqZBUDw/N2FGGXY1j2OKRhc7KFMoSYXA/tXhJEj9ETKJAwnq0aLPV47Pxl2O/6H3Qd6KIduZgpQnFJ/OnUl+AQUaQDs44zgXbxPlpxYexkSvMgN5LBVw8spkvXY2aOI0bAzNZ98G60QOJuGpu46VKjixuSOFZnzU0JOgRR7xFY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1vHeos-0004we-Oe; Sat, 08 Nov 2025 10:01:14 +0100 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1vHeos-007fMJ-1Q; Sat, 08 Nov 2025 10:01:14 +0100 Received: from hardanger.blackshift.org (unknown [IPv6:2a01:4f8:1c1c:29e9:22:41ff:fe00:1400]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: mkl-all@blackshift.org) by smtp.blackshift.org (Postfix) with ESMTPSA id BBB5549A89E; Sat, 08 Nov 2025 09:01:13 +0000 (UTC) From: Marc Kleine-Budde Date: Sat, 08 Nov 2025 10:01:03 +0100 Subject: [PATCH can 3/3] can: gs_usb: gs_usb_receive_bulk_callback(): check actual_length before accessing data Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251108-gs_usb-fix-usb-callbacks-v1-3-8a2534a7ea05@pengutronix.de> References: <20251108-gs_usb-fix-usb-callbacks-v1-0-8a2534a7ea05@pengutronix.de> In-Reply-To: <20251108-gs_usb-fix-usb-callbacks-v1-0-8a2534a7ea05@pengutronix.de> To: Vincent Mailhol , Maximilian Schneider , Wolfgang Grandegger Cc: kernel@pengutronix.de, linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Kleine-Budde X-Mailer: b4 0.15-dev-509f5 X-Developer-Signature: v=1; a=openpgp-sha256; l=4422; i=mkl@pengutronix.de; h=from:subject:message-id; bh=ISveydnAGqHXLegHAkh7CeD6kEHV3cPFgoiC794xNh8=; b=owEBbQGS/pANAwAKAQx0Zd/5kJGcAcsmYgBpDwbVLGDGqr9V0Eqb2S/9HvthfmGZE/9pa0TSn KPTMiz2rGGJATMEAAEKAB0WIQSf+wzYr2eoX/wVbPMMdGXf+ZCRnAUCaQ8G1QAKCRAMdGXf+ZCR nORnB/4k+jvB/xk12G2tYFI3x7bYBLm1V3NEEg8+7v/R18dw8JMXt/laazet4pBjVYTMRxkQyPH hoTNo7jZIKR53j41tpKUZOGotdZRYOqlXwNTzvpsXBvwwEwWj5W51470Mo/v6+LdIke1PCXi9vl 3Tv95s+tcNWmnhqy36FhfGLGs53WCjLN61NTOdp5v6ZPDMNkoF3Om+Mh6/uJVWYv7leOWezBRqM JLwyuvh8WQ297dCGcqNCXAaQvA4byNx/VfN3de3LI7fs+tCedB4szmWFfrSsaUq626hmsMN0xXE EqrPsEBg+YwrqU0ypVwblqNNo7k+qJkAvrQjxSZ0j+YkdHIP X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org The URB received in gs_usb_receive_bulk_callback() contains a struct gs_host_frame. The length of the data after the header depends on the gs_host_frame hf::flags and the active device features (e.g. time stamping). Introduce a new function gs_usb_get_minimum_length() and check that we have at least received the required amount of data before accessing it. Only copy the data to that skb that has actually been received. Fixes: d08e973a77d1 ("can: gs_usb: Added support for the GS_USB CAN devices= ") Signed-off-by: Marc Kleine-Budde --- drivers/net/can/usb/gs_usb.c | 65 ++++++++++++++++++++++++++++++++++++++++= ---- 1 file changed, 60 insertions(+), 5 deletions(-) diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index 51f8d694104d..8524d423b029 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c @@ -261,6 +261,11 @@ struct canfd_quirk { u8 quirk; } __packed; =20 +/* struct gs_host_frame::echo_id =3D=3D GS_HOST_FRAME_ECHO_ID_RX indicates + * a regular RX'ed CAN frame + */ +#define GS_HOST_FRAME_ECHO_ID_RX 0xffffffff + struct gs_host_frame { struct_group(header, u32 echo_id; @@ -570,6 +575,43 @@ gs_usb_get_echo_skb(struct gs_can *dev, struct sk_buff= *skb, return len; } =20 +static unsigned int +gs_usb_get_minimum_length(const struct gs_can *dev, const struct gs_host_f= rame *hf, + unsigned int *data_length_p) +{ + unsigned int minimum_length, data_length; + + /* TX echo only uses the header */ + if (hf->echo_id !=3D GS_HOST_FRAME_ECHO_ID_RX) { + *data_length_p =3D 0; + return sizeof(hf->header); + } + + if (hf->flags & GS_CAN_FLAG_FD) { + data_length =3D can_fd_dlc2len(hf->can_dlc); + + if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) + /* timestamp follows data field of max size */ + minimum_length =3D struct_size(hf, canfd_ts, 1); + else + minimum_length =3D sizeof(hf->header) + data_length; + } else { + if (hf->can_id & cpu_to_le32(CAN_RTR_FLAG)) + data_length =3D 0; + else + data_length =3D can_cc_dlc2len(hf->can_dlc); + + if (dev->feature & GS_CAN_FEATURE_HW_TIMESTAMP) + /* timestamp follows data field of max size */ + minimum_length =3D struct_size(hf, classic_can_ts, 1); + else + minimum_length =3D sizeof(hf->header) + data_length; + } + + *data_length_p =3D data_length; + return minimum_length; +} + static void gs_usb_receive_bulk_callback(struct urb *urb) { struct gs_usb *parent =3D urb->context; @@ -578,7 +620,7 @@ static void gs_usb_receive_bulk_callback(struct urb *ur= b) int rc; struct net_device_stats *stats; struct gs_host_frame *hf =3D urb->transfer_buffer; - unsigned int minimum_length; + unsigned int minimum_length, data_length; struct gs_tx_context *txc; struct can_frame *cf; struct canfd_frame *cfd; @@ -621,20 +663,33 @@ static void gs_usb_receive_bulk_callback(struct urb *= urb) if (!netif_running(netdev)) goto resubmit_urb; =20 - if (hf->echo_id =3D=3D -1) { /* normal rx */ + minimum_length =3D gs_usb_get_minimum_length(dev, hf, &data_length); + if (urb->actual_length < minimum_length) { + stats->rx_errors++; + stats->rx_length_errors++; + + if (net_ratelimit()) + netdev_err(netdev, + "short read (actual_length=3D%u, minimum_length=3D%u)\n", + urb->actual_length, minimum_length); + + goto resubmit_urb; + } + + if (hf->echo_id =3D=3D GS_HOST_FRAME_ECHO_ID_RX) { /* normal rx */ if (hf->flags & GS_CAN_FLAG_FD) { skb =3D alloc_canfd_skb(netdev, &cfd); if (!skb) return; =20 cfd->can_id =3D le32_to_cpu(hf->can_id); - cfd->len =3D can_fd_dlc2len(hf->can_dlc); + cfd->len =3D data_length; if (hf->flags & GS_CAN_FLAG_BRS) cfd->flags |=3D CANFD_BRS; if (hf->flags & GS_CAN_FLAG_ESI) cfd->flags |=3D CANFD_ESI; =20 - memcpy(cfd->data, hf->canfd->data, cfd->len); + memcpy(cfd->data, hf->canfd->data, data_length); } else { skb =3D alloc_can_skb(netdev, &cf); if (!skb) @@ -643,7 +698,7 @@ static void gs_usb_receive_bulk_callback(struct urb *ur= b) cf->can_id =3D le32_to_cpu(hf->can_id); can_frame_set_cc_len(cf, hf->can_dlc, dev->can.ctrlmode); =20 - memcpy(cf->data, hf->classic_can->data, 8); + memcpy(cf->data, hf->classic_can->data, data_length); =20 /* ERROR frames tell us information about the controller */ if (le32_to_cpu(hf->can_id) & CAN_ERR_FLAG) --=20 2.51.0