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 68A4C308F3E for ; Mon, 4 May 2026 08:34:07 +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=1777883647; cv=none; b=ngi082RKMBbrIy3m35hyVAuiZFn1sWy1lHOOHoDAGB+EbI+MbXg8GqsquB8fsp9tUQQAG9LGq4UADByJ3bGU3dkV2+xhEdDdvBRDy2iBxGa1p6lRnSvLzh/BQ1tLFbd1Oa+pxInO7AUYYWzApktA6tk/FTW75eZ+0FzLnQ6iCXg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777883647; c=relaxed/simple; bh=76sFy00OJEKFMLM7mNN4gEl086zd2keRhCj0vY+RYII=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NRXmDpdCkcLGnEE/6oCgIFc+Jkhal7EE9K+wy/6TfMY1KAmQ1ddcJWR3+nlsqXi9+P/lIkeCjHowg4kYQYm4nReFQ1K44hSRniCdpXbVy+1jdSNDozp/Ku1F3YlUq9HYk6VENwgZZwPY13YcP4recBEH5hHMHVfYn4HKQX4RleI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GRZ+aOgO; 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="GRZ+aOgO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91444C2BCB8; Mon, 4 May 2026 08:34:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777883647; bh=76sFy00OJEKFMLM7mNN4gEl086zd2keRhCj0vY+RYII=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GRZ+aOgO7gUZTEmtmfPCxTedmhj4M/vX471gbem8M9nWJROD6vn8pOZsRFGrsyDBS z8E6ehVerrOEAEbK5ujOxj1TojMDwhDSL9i96z7LtlKBH6IRSdv85WF46QTeMqfuNd 1HS1hDQ0PlJSjYcTPQhmcnFK/maaVKE/47iuSFTZDd3ie3VoqW/POqMQpyaibofYTk +IivpnId82Cx2pIunsnarTMMsZC6nN5zbc668BiYBRJX4TGSyox5CGn3T2qfa4KtXm WKoWJLpIjgfeLB7YWpynyYZJArwxt0/WMO7u3RLPNQLKe9jDL+ApS4Vky4ui8wiW0e EJLGZgdNPWiwQ== From: Sasha Levin To: stable@vger.kernel.org Cc: Yuan Zhaoming , Jeremy Kerr , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1.y] net: mctp: fix don't require received header reserved bits to be zero Date: Mon, 4 May 2026 04:34:02 -0400 Message-ID: <20260504083402.1884264-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026050123-extent-rosy-a476@gregkh> References: <2026050123-extent-rosy-a476@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yuan Zhaoming [ Upstream commit a663bac71a2f0b3ac6c373168ca57b2a6e6381aa ] >From the MCTP Base specification (DSP0236 v1.2.1), the first byte of the MCTP header contains a 4 bit reserved field, and 4 bit version. On our current receive path, we require those 4 reserved bits to be zero, but the 9500-8i card is non-conformant, and may set these reserved bits. DSP0236 states that the reserved bits must be written as zero, and ignored when read. While the device might not conform to the former, we should accept these message to conform to the latter. Relax our check on the MCTP version byte to allow non-zero bits in the reserved field. Fixes: 889b7da23abf ("mctp: Add initial routing framework") Signed-off-by: Yuan Zhaoming Cc: stable@vger.kernel.org Acked-by: Jeremy Kerr Link: https://patch.msgid.link/20260417141340.5306-1-yuanzhaoming901030@126.com Signed-off-by: Jakub Kicinski [ Context ] Signed-off-by: Sasha Levin --- include/net/mctp.h | 3 +++ net/mctp/route.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/net/mctp.h b/include/net/mctp.h index afeda2ad22d6d..2da82878155bb 100644 --- a/include/net/mctp.h +++ b/include/net/mctp.h @@ -26,6 +26,9 @@ struct mctp_hdr { #define MCTP_VER_MIN 1 #define MCTP_VER_MAX 1 +/* Definitions for ver field */ +#define MCTP_HDR_VER_MASK GENMASK(3, 0) + /* Definitions for flags_seq_tag field */ #define MCTP_HDR_FLAG_SOM BIT(7) #define MCTP_HDR_FLAG_EOM BIT(6) diff --git a/net/mctp/route.c b/net/mctp/route.c index fdeaf80691e55..2bbc05d92765b 100644 --- a/net/mctp/route.c +++ b/net/mctp/route.c @@ -335,6 +335,7 @@ static int mctp_route_input(struct mctp_route *route, struct sk_buff *skb) unsigned long f; u8 tag, flags; int rc; + u8 ver; msk = NULL; rc = -EINVAL; @@ -357,7 +358,8 @@ static int mctp_route_input(struct mctp_route *route, struct sk_buff *skb) mh = mctp_hdr(skb); skb_pull(skb, sizeof(struct mctp_hdr)); - if (mh->ver != 1) + ver = mh->ver & MCTP_HDR_VER_MASK; + if (ver < MCTP_VER_MIN || ver > MCTP_VER_MAX) goto out; flags = mh->flags_seq_tag & (MCTP_HDR_FLAG_SOM | MCTP_HDR_FLAG_EOM); @@ -1124,6 +1126,7 @@ static int mctp_pkttype_receive(struct sk_buff *skb, struct net_device *dev, struct mctp_skb_cb *cb; struct mctp_route *rt; struct mctp_hdr *mh; + u8 ver; rcu_read_lock(); mdev = __mctp_dev_get(dev); @@ -1141,7 +1144,8 @@ static int mctp_pkttype_receive(struct sk_buff *skb, struct net_device *dev, /* We have enough for a header; decode and route */ mh = mctp_hdr(skb); - if (mh->ver < MCTP_VER_MIN || mh->ver > MCTP_VER_MAX) + ver = mh->ver & MCTP_HDR_VER_MASK; + if (ver < MCTP_VER_MIN || ver > MCTP_VER_MAX) goto err_drop; /* source must be valid unicast or null; drop reserved ranges and -- 2.53.0