From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from codeconstruct.com.au (pi.codeconstruct.com.au [203.29.241.158]) (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 D4C1B389104; Tue, 30 Jun 2026 03:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=203.29.241.158 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782790057; cv=none; b=QOjnUdD2JGENL9Nj2JcaDP6pJudCIM2n4dOR8HcELDRpk1R+Q6YWSrDnFEddsx9EYDSBRvaWw1QqJQslgivU27sM1+0Of39aW7NcF47Wms3z0UdwgvVXRIk8F5ec9bJBD1KbK9EPVOqWO1cP8uvaw+EYixe7raYwlHENwJZlOsQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782790057; c=relaxed/simple; bh=LQZc4rIna5P6w5GjBtRUSMmbad/eKzzcgHBBcPUi+a8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FASfgPawkT5HsDDj2SV6pvBeyQS/lwjfsN0lMgNKj3Yy4MZrSXChGm6+oZz1Td4Rft/8evupJ8rTeYM/2Co3v2+RwOzJrBJ5xuraYefbbhE3IJLOOIaH2wG+On8ZjEGrsHvuuaw9EC5TMx+msmt6J7ZwL93FJ1e1B4Dp3oqAQgU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au; spf=pass smtp.mailfrom=codeconstruct.com.au; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b=JEKzISGh; arc=none smtp.client-ip=203.29.241.158 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=codeconstruct.com.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=codeconstruct.com.au header.i=@codeconstruct.com.au header.b="JEKzISGh" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeconstruct.com.au; s=2022a; t=1782789746; bh=3vAgljkxOZKzaYntzYofEQoz0xcOMVn5Ns3RtQoLP38=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=JEKzISGhof3gJ4P7425DUPS8yfPUhtlTFcne/K2MpQBfya34/iguoOjnSx+yTVn51 n6p9hznA1FgTQdkJbU6uRr0o/j0g4HwzkVhBkuDojD03KAv9uaWmjzqUKQpEmXIpTH Ii60PvJA88kMobaiIE6/kjaQ/l2SmDvs5GfWjx4F1f7xlHl5B3HFOeUPAeFdoqtf4h 6IzT+pqcxHqR0A+iNuNSNYpvvwY0tv29ra6RegNsVCLoavQstOi5odqoN/9NV+dbmz wsYScY45eJIsXOZj45DaX3M++9/yZCa3jrUuhLJTZ9j7B1mDbYeHJWZVeN0yz+rKh+ FESWfetoiYEMg== Received: by codeconstruct.com.au (Postfix, from userid 10000) id 52733660ED; Tue, 30 Jun 2026 11:22:26 +0800 (AWST) From: Jeremy Kerr Date: Tue, 30 Jun 2026 11:21:23 +0800 Subject: [PATCH net-next 02/12] net: mctp: usb: Use packet-length max for maximum packet-size check Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260630-dev-mctp-usb-1-1-v1-2-86a311fc67b7@codeconstruct.com.au> References: <20260630-dev-mctp-usb-1-1-v1-0-86a311fc67b7@codeconstruct.com.au> In-Reply-To: <20260630-dev-mctp-usb-1-1-v1-0-86a311fc67b7@codeconstruct.com.au> To: Matt Johnston , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Greg Kroah-Hartman Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org X-Mailer: b4 0.16-dev The max packet size is smaller than the max transfer size, as we only have a u8 length field in the transport header. Add a define for the maximum representable length, and use that for our check. Use this for the MTU maximum calculation too. Signed-off-by: Jeremy Kerr --- drivers/net/mctp/mctp-usb.c | 2 +- include/linux/usb/mctp-usb.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/mctp/mctp-usb.c b/drivers/net/mctp/mctp-usb.c index 545eff06322c..c6e36b63e87a 100644 --- a/drivers/net/mctp/mctp-usb.c +++ b/drivers/net/mctp/mctp-usb.c @@ -76,7 +76,7 @@ static netdev_tx_t mctp_usb_start_xmit(struct sk_buff *skb, plen = skb->len; - if (plen + sizeof(*hdr) > MCTP_USB_1_0_XFER_SIZE) + if (plen + sizeof(*hdr) > MCTP_USB_1_0_PKTLEN_MAX) goto err_drop; rc = skb_cow_head(skb, sizeof(*hdr)); diff --git a/include/linux/usb/mctp-usb.h b/include/linux/usb/mctp-usb.h index 47e2e3931d63..2bece8afd1c7 100644 --- a/include/linux/usb/mctp-usb.h +++ b/include/linux/usb/mctp-usb.h @@ -25,7 +25,8 @@ struct mctp_usb_hdr { #define MCTP_USB_1_0_XFER_SIZE 512 #define MCTP_USB_BTU 68 #define MCTP_USB_MTU_MIN MCTP_USB_BTU -#define MCTP_USB_1_0_MTU_MAX (U8_MAX - sizeof(struct mctp_usb_hdr)) +#define MCTP_USB_1_0_PKTLEN_MAX U8_MAX +#define MCTP_USB_1_0_MTU_MAX (MCTP_USB_1_0_PKTLEN_MAX - sizeof(struct mctp_usb_hdr)) #define MCTP_USB_DMTF_ID 0x1ab4 #endif /* __LINUX_USB_MCTP_USB_H */ -- 2.47.3