From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) (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 3AED238331B for ; Mon, 24 Aug 2026 21:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.51 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787607668; cv=none; b=dsE3qk7JeIv4leN8yeSketOy5csS5luZI5QLZ+lxUXJvZNismwV1pfcKNEvoqTZUDye3/niRrrk4uXfiDCGIR/rdcL2WTPzzOnJjocgoh4kwU4Zr+M+jg+NsBymvPkzdhO9KyE+USRuGx57qVRImlP0TN2FYtJCpAdIjXt0Ec04= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787607668; c=relaxed/simple; bh=WrLECu6vT+7aI1wH8qutkqPtHYimnJ3bFMO50vk3vPg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=aKpiGx0+sCbFo4bodXjLMSOLQxq/alU2p/L4qHOZhbv4QxbVSyjglk4hiG7qEii1Gpf1wAarySqwCAkSUhZJX59gSm9RG4moy+UrwBTdW3do22VoPbpe7ktRBRzi+ZoMN/G8sE8k4cCW7E+PCijDRUfSacMgv+lclrqIcu/H7aE= 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=geX9kouO; arc=none smtp.client-ip=209.85.216.51 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="geX9kouO" Received: by mail-pj1-f51.google.com with SMTP id 98e67ed59e1d1-3964b061528so200876a91.1 for ; Mon, 24 Aug 2026 14:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1787607666; x=1788212466; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=qOhcTB4KjILVw1lywIMVOHG+BE0wc/PeD6Ix52xTTSU=; b=geX9kouOgC/8MZO8dMRIYyXczI/kaaRf6KhApdDxs5AKvqzKPG+O/01fL9Zg5vkw89 LTZ/IMKqfZhg2qx+7NshwSo9oEHO/+lZe5nI/Y7lxIh5IZUAkzOtBXL8dNditgcQWJko rRk/qrZY9kL7iLtDpoxbA64D4p9L/x03afqv6qPKArRXb/RrZy15DBOZBfPcLJon/Pcx NeYM5Gq9z826xZBykA60Y3z+U/8A8wvWUis61pkDXxoVjPH0+8srmqDUWth5tO/FQ6IA ndjrbEc48CjFtyBoNCCdnDBRlOzz7Af+v1Oz91p3WAlGrvNC/XKdyQliQ3VNqdLJs8gX Rasw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787607666; x=1788212466; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=qOhcTB4KjILVw1lywIMVOHG+BE0wc/PeD6Ix52xTTSU=; b=rAie1vXeJmkZoAxImFrQB0OIZOpkLCJsPeZrgGCAqjTlG0eL4TwIWW+k8UrfXwtcrl XT5rcoOeUSa0OFHQy2S+C70+k8RHIeMK28hZ0HhN8nZTR5m9zJzua6Cp88SOtX08N0q7 17XpIGKvsCogXUe4PK6spjC16qEroZQ6Ujt7+PtNkFRRUb7qMBtMAMirORcuznkeN9b9 wmYbIIq2RWlkdI2gdWH9WdWBNaelFofe2maSJKMjPcpX5Z1HCzw4PIC3EanzdeaSfDsk 1xrrqDU6Nf793HoXUM/la/pB/V2PwgUQ83MbnKwaIeODZYyXVzNLd3BmrTl6oHD/NP9w pGew== X-Forwarded-Encrypted: i=1; AHgh+Rondg1bLD2amDL6RAcjo7M1U5m9pYRR+qsRnjeyM4GeFLt1lrIZBKHshT+fy6xOJckH5PCNS20J5YPlkCo=@vger.kernel.org X-Gm-Message-State: AFuF++n3jXVEn4Iup6QMrCoP32ubv121cDRwslwSexvAnZ0Je7amq0qQ PKGUhUcfoJLnqsEhjQYfayy1o9oWh+hPDmBNpafvZ7Z1le4/ZYKMc+ai X-Gm-Gg: AR+sD11ERXVAKij4Z9hhDr6cqrPA4lVOatYQ7FeLKPzSzWteB3P5PxHh7Vz9a6g127Y YXsf0edzjGO1Y9RU3J2DWS+JY9ZPMJYeF/QrYkV2idJVK8aH6rJJ5GiUOMkHdj72pWbc5AKgeut A6zFMwVKL5simVoEsWLQsez6JTSKGsQJqBjoNlOLMtURuXnx/e3pftSKon+oh0LDYguXf7FIMOI 5dui7McfFfwCOTxf9+VNb8kIDsykNaZFymcy/e2hmws96SuFrqJd/icqo0ZcRJLL/Zz5yWJr+77 qMldk8DAT0XEGdXKzR35qLv6y/N+JXrfwfkfxr0uJ3Guz2SWkaHOShWMqRaXcJjOclKgOKM7Oq9 a+Vyqm8oZX8kcLEzHETH4ocY30MWBkwuNFbDONKyvKqZBDhI0VrZ7s444udUi7XuZCOEehy2lZR ynhR2yojJ47ACl8Mv6GTq33MTthZPflydqPopRpDDfgDDaseg8/9iy16yMr4TkegzSU7+15gUmU XVTLrJ9SCUMsUApMuKhjKS8 X-Received: by 2002:a17:90b:5485:b0:38e:11ba:992c with SMTP id 98e67ed59e1d1-395df6080e0mr42655870a91.12.1787607666513; Mon, 24 Aug 2026 14:41:06 -0700 (PDT) Received: from localhost.localdomain ([2001:4898:a800:1010:84e9:817f:7171:6561]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-39645bbf440sm1036864a91.14.2026.08.24.14.41.03 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 24 Aug 2026 14:41:06 -0700 (PDT) From: "Cen Zhang (Microsoft)" To: mkl@pengutronix.de, mailhol@kernel.org Cc: nb@tipi-net.de, nihaal@cse.iitm.ac.in, eritque-arcus@ikuyo.dev, kees@kernel.org, pabeni@redhat.com, enrico.pozzobon@dissecto.com, extnj@kvaser.com, chbe@kvaser.com, extja@kvaser.com, mh@kvaser.com, linux-can@vger.kernel.org, linux-kernel@vger.kernel.org, AutonomousCodeSecurity@microsoft.com, xmei5@asu.edu, tgopinath@linux.microsoft.com, kys@microsoft.com, blbllhy@gmail.com Subject: [PATCH net v2] can: kvaser_usb: validate command format before parsing in hydra receive path Date: Mon, 24 Aug 2026 17:40:58 -0400 Message-ID: <20260824214058.44948-1-blbllhy@gmail.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The receive-path command parsers (kvaser_usb_hydra_wait_cmd and kvaser_usb_hydra_read_bulk_callback) call kvaser_usb_hydra_cmd_size() without verifying that enough buffer remains. For CMD_EXTENDED, kvaser_usb_hydra_cmd_size() unconditionally reads a 2-byte len field at offset 4 (kvaser_usb_hydra.c:532). A malicious USB device can place a CMD_EXTENDED header at the end of a 3072-byte bulk transfer such that only 4 bytes remain, causing a 2-byte slab-out-of-bounds read. BUG: KASAN: slab-out-of-bounds in kvaser_usb_hydra_wait_cmd+0x3f1/0x480 [kvaser_usb_hydra.c:678] Read of size 2 at addr ffff888013f7ec00 by task kworker/0:0/9 kvaser_usb_hydra_wait_cmd+0x3f1/0x480 kvaser_usb_hydra_get_software_details+0x1c7/0x5d0 kvaser_usb_probe+0x36a/0x1240 Additionally, if the device sends CMD_EXTENDED with len=0, kvaser_usb_hydra_cmd_size() returns 0 and the parser loops forever (pos += 0), permanently burning one CPU core. Fix by adding kvaser_usb_hydra_cmd_size_rx(), a receive-path wrapper that validates buffer bounds before calling kvaser_usb_hydra_cmd_size(). Callers check for zero return to reject both issues above. Clear invalid leftover state before returning so subsequent transfers do not retry the same malformed command. Fixes: aec5fb2268b7 ("can: kvaser_usb: Add support for Kvaser USB hydra family") Reported-by: AutonomousCodeSecurity@microsoft.com Reported-by: Xiang Mei (Microsoft) Reported-by: Cen Zhang (Microsoft) Link: https://lore.kernel.org/all/20260819145658.29872-1-blbllhy@gmail.com Signed-off-by: Cen Zhang (Microsoft) --- v2: - Clear malformed leftover state before returning. - Reject command lengths shorter than the buffered prefix. v1: - The zero-length command loop is also addressed by: https://lore.kernel.org/linux-can/20260815-can-esd-hydra-fixes-v1-2-de644cbeaec2@ikuyo.dev/ - This patch additionally handles truncated command headers in the synchronous wait and asynchronous receive paths, including the leftover-buffer path. .../net/can/usb/kvaser_usb/kvaser_usb_hydra.c | 36 ++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c index efbb7bed34c9..534bd2683012 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c @@ -536,6 +536,20 @@ static size_t kvaser_usb_hydra_cmd_size(struct kvaser_cmd *cmd) return ret; } +/* Receive-path wrapper: validate buffer bounds before reading cmd_size. */ +static size_t kvaser_usb_hydra_cmd_size_rx(struct kvaser_cmd *cmd, + size_t remaining) +{ + if (remaining < sizeof(struct kvaser_cmd_header)) + return 0; + + if (cmd->header.cmd_no == CMD_EXTENDED && + remaining < offsetof(struct kvaser_cmd_ext, cmd_no_ext)) + return 0; + + return kvaser_usb_hydra_cmd_size(cmd); +} + static struct kvaser_usb_net_priv * kvaser_usb_hydra_net_priv_from_cmd(const struct kvaser_usb *dev, const struct kvaser_cmd *cmd) @@ -675,8 +689,9 @@ static int kvaser_usb_hydra_wait_cmd(const struct kvaser_usb *dev, u8 cmd_no, size_t cmd_len; tmp_cmd = buf + pos; - cmd_len = kvaser_usb_hydra_cmd_size(tmp_cmd); - if (pos + cmd_len > actual_len) { + cmd_len = kvaser_usb_hydra_cmd_size_rx(tmp_cmd, + actual_len - pos); + if (!cmd_len || pos + cmd_len > actual_len) { dev_err_ratelimited(&dev->intf->dev, "Format error\n"); break; @@ -2124,7 +2139,15 @@ static void kvaser_usb_hydra_read_bulk_callback(struct kvaser_usb *dev, cmd = (struct kvaser_cmd *)card_data->usb_rx_leftover; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); + cmd_len = kvaser_usb_hydra_cmd_size_rx(cmd, + KVASER_USB_HYDRA_MAX_CMD_LEN); + + if (!cmd_len || cmd_len < usb_rx_leftover_len) { + dev_err(&dev->intf->dev, "Format error\n"); + card_data->usb_rx_leftover_len = 0; + spin_unlock_irqrestore(usb_rx_leftover_lock, irq_flags); + return; + } remaining_bytes = min_t(unsigned int, len, cmd_len - usb_rx_leftover_len); @@ -2132,6 +2155,7 @@ static void kvaser_usb_hydra_read_bulk_callback(struct kvaser_usb *dev, if (remaining_bytes + usb_rx_leftover_len > KVASER_USB_HYDRA_MAX_CMD_LEN) { dev_err(&dev->intf->dev, "Format error\n"); + card_data->usb_rx_leftover_len = 0; spin_unlock_irqrestore(usb_rx_leftover_lock, irq_flags); return; } @@ -2154,7 +2178,11 @@ static void kvaser_usb_hydra_read_bulk_callback(struct kvaser_usb *dev, while (pos < len) { cmd = buf + pos; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); + cmd_len = kvaser_usb_hydra_cmd_size_rx(cmd, len - pos); + if (!cmd_len) { + dev_err(&dev->intf->dev, "Format error\n"); + return; + } if (pos + cmd_len > len) { /* We got first part of a command */ -- 2.55.0