From mboxrd@z Thu Jan 1 00:00:00 1970 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 D34693195FD; Sun, 7 Jun 2026 10:38:51 +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=1780828732; cv=none; b=MtReBSgr8X3h2/OcXa+g07QX/NpNTosRur7LEo3XybORfEwxW4eWTAJcLioaBXYYjk6Mlz85zbVYI7w+Ak7zRGcvIPs0ZeBHxlKuxIEIFcgpd3E776TRlvy2rMm6Rk9huYhUipSEoesckppz8f9Rtqo29FqG4bg8r8/GKuNY+Qw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780828732; c=relaxed/simple; bh=1CO4siLUEg3P2uFyf0VJIEnOVLgVEHrcvT5pNocHyqs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F4LRVwpMIkQC+hqeAN/dNmGGJRcyWEhAXBOZSuwZvAzf1c75eWvMkG5p9pK49Vu6J2vrWx7R5GfrHI1DPhoxipOdL1TIP0xVB3CZXPsXF3ij8qK0YhC14IEudZX8XPtUYgxNGycPIieHUcTjaA3XrIaQ8f001ir1HThc+lNdd+w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jiA4lN7b; 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="jiA4lN7b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF6B51F00893; Sun, 7 Jun 2026 10:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780828731; bh=vkND0//e2cPumWGeKISX5K0jme8gezpVAMzNl3R8d5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jiA4lN7blf6HXzJ7ygpiVxMwygr3/BFJEdmSy1o4NfDND6N5Yw49vIzv4rP649xFi ZTkCrZ4RBpsc5qHvk23sv26PHF2y0t/TaT6+MHZ4Is0o7A5Zlg6VNiiKV2KbPkNHlt ZFouLxLp3BZAV/PEKP8p8N2COUl0+0wv0gploRm8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yuhao Jiang , Junrui Luo , Jakub Kicinski Subject: [PATCH 6.18 186/315] macsec: fix replay protection at XPN lower-PN wrap Date: Sun, 7 Jun 2026 11:59:33 +0200 Message-ID: <20260607095734.412116941@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Junrui Luo commit e68842b3356471ba56c882209f324613dac47f64 upstream. In macsec_post_decrypt(), when pn is U32_MAX, pn + 1 overflows u32 to 0 and the first branch never fires. If next_pn_halves.lower is also in the upper half, pn_same_half(pn, lower) is true and the XPN else-if does not fire either, leaving next_pn_halves unchanged. An attacker that captures the legitimate frame carrying pn == 0xFFFFFFFF on an XPN association can then replay it indefinitely, since lowest_pn never rises above the captured pn and macsec_decrypt() reconstructs the same IV. Extend the XPN else-if to also fire when pn + 1 wraps to 0, so receipt of pn == U32_MAX advances next_pn_halves to (upper + 1, 0). Fixes: a21ecf0e0338 ("macsec: Support XPN frame handling - IEEE 802.1AEbw") Reported-by: Yuhao Jiang Cc: stable@vger.kernel.org Signed-off-by: Junrui Luo Link: https://patch.msgid.link/SYBPR01MB78813FD49E58F253B989F197AF012@SYBPR01MB7881.ausprd01.prod.outlook.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -804,7 +804,8 @@ static bool macsec_post_decrypt(struct s if (pn + 1 > rx_sa->next_pn_halves.lower) { rx_sa->next_pn_halves.lower = pn + 1; } else if (secy->xpn && - !pn_same_half(pn, rx_sa->next_pn_halves.lower)) { + (pn + 1 == 0 || + !pn_same_half(pn, rx_sa->next_pn_halves.lower))) { rx_sa->next_pn_halves.upper++; rx_sa->next_pn_halves.lower = pn + 1; }