Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 676BD470E94 for ; Wed, 5 Aug 2026 12:09:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785931798; cv=none; b=RvpGZL5PjWPOfTraIFHfjF0e/tg2Dad5mP5KHY7Dk3ZjkhTWpI8t0wvh7UKHB2kezknqmR/CUNpnshQiqq0Sv9Gdfnel5Jt2hQ634MxqnDGlVpKJJ2fSAiXYR/5GUavNRSD9TnydJT6Tg3htncPo8ADS1egA/TIrBeZDIOKEVas= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785931798; c=relaxed/simple; bh=iUSKGRb0hWkPJM/ADOHIinS8CkVONudD4nlhGPoMc6w=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=Yoymsl0a275qRgVMZWFUELX3LN0zwwr1AVZE8mTWyfTVUlg09SuzhhKU8whKuMBGved4IpEvOEA0/BxuHT7RsB4dSTQwvL+KtNV6XyapG4re4w2ZCaMZxIFJzbz7bhOnovA3X7lMUypzga7jwaZtyNi4Kp9z2Kswu3QncUO7DPY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LmO6eE+b; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LmO6eE+b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 46EF31F01558; Wed, 5 Aug 2026 12:09:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1785931776; bh=S4KMeKPjtNlugfvfzci8PfPHUtndShFOuMZEXGxCoQw=; h=Subject:To:Cc:From:Date; b=LmO6eE+biriooYNaoXO6X9aZHKbYmRwMzG4jR/0nzEeFlWWTFJ8ueTqeXozgNrwAH V4+F0MsMGM8bkDpJ0ZQAtTpyFvY7pFOHi/tfYCT59YWCXhLnRVRXY04c/5SYLYwO+z 1p40VCz/jQ0TUmlAr3ZwIzbsFFpsKy2RDrzvA6wo= Subject: FAILED: patch "[PATCH] can: ems_usb: validate CPC message lengths" failed to apply to 5.10-stable tree To: pengpeng@iscas.ac.cn,mkl@pengutronix.de Cc: From: Date: Wed, 05 Aug 2026 14:06:19 +0200 Message-ID: <2026080519-postwar-croak-21f6@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 5.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y git checkout FETCH_HEAD git cherry-pick -x 02925f51377f2a42a6724f00549167499c9302e5 # git commit -s git send-email --to '' --in-reply-to '2026080519-postwar-croak-21f6@gregkh' --subject-prefix 'PATCH 5.10.y' 'HEAD^..' Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ From 02925f51377f2a42a6724f00549167499c9302e5 Mon Sep 17 00:00:00 2001 From: Pengpeng Hou Date: Mon, 6 Jul 2026 17:27:52 +0800 Subject: [PATCH] can: ems_usb: validate CPC message lengths ems_usb_read_bulk_callback() walks CPC messages packed in one USB receive buffer. Check that each declared message fits in the URB payload. Also require the type-specific payload to cover the fields used by the CAN, state, error and overrun handlers. Signed-off-by: Pengpeng Hou Link: https://patch.msgid.link/20260706092752.79600-1-pengpeng@iscas.ac.cn Fixes: 702171adeed3 ("ems_usb: Added support for EMS CPC-USB/ARM7 CAN/USB interface") Cc: stable@vger.kernel.org Signed-off-by: Marc Kleine-Budde diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 9b25dda7c183..24cf8f651f8f 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c @@ -409,6 +409,40 @@ static void ems_usb_rx_err(struct ems_usb *dev, struct ems_cpc_msg *msg) netif_rx(skb); } +static bool ems_usb_rx_msg_len_valid(struct ems_cpc_msg *msg) +{ + size_t len = msg->length; + size_t can_len; + + switch (msg->type) { + case CPC_MSG_TYPE_CAN_STATE: + return len >= sizeof(msg->msg.can_state); + + case CPC_MSG_TYPE_CAN_FRAME: + case CPC_MSG_TYPE_EXT_CAN_FRAME: + case CPC_MSG_TYPE_RTR_FRAME: + case CPC_MSG_TYPE_EXT_RTR_FRAME: + if (len < CPC_CAN_MSG_MIN_SIZE) + return false; + + if (msg->type == CPC_MSG_TYPE_RTR_FRAME || + msg->type == CPC_MSG_TYPE_EXT_RTR_FRAME) + return true; + + can_len = can_cc_dlc2len(msg->msg.can_msg.length & 0xf); + return len >= CPC_CAN_MSG_MIN_SIZE + can_len; + + case CPC_MSG_TYPE_CAN_FRAME_ERROR: + return len >= sizeof(msg->msg.error); + + case CPC_MSG_TYPE_OVERRUN: + return len >= sizeof(msg->msg.overrun); + + default: + return true; + } +} + /* * callback for bulk IN urb */ @@ -451,6 +485,15 @@ static void ems_usb_read_bulk_callback(struct urb *urb) } msg = (struct ems_cpc_msg *)&ibuf[start]; + if (msg->length > + urb->actual_length - start - CPC_MSG_HEADER_LEN) { + netdev_err(netdev, "format error\n"); + break; + } + if (!ems_usb_rx_msg_len_valid(msg)) { + netdev_err(netdev, "format error\n"); + break; + } switch (msg->type) { case CPC_MSG_TYPE_CAN_STATE: