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 661C04EB84C; Thu, 17 Sep 2026 17:58:07 +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=1789667888; cv=none; b=iDuqhmAcmTK+a0KN5RImnil7LZwBaJVkWFo/ds0WuOJl1v4FdG4dKJopVZNfPUZYyMNdrjA2q7EkD3j9P5vQ8GdEnlREFSfQiilCd9V9np6hKQYX8qI9CcS1sUSdzsZ5q1Lnp9z0O3cwyxN2WpMZWUfU8nT11ZDakvhpOoBfCfQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789667888; c=relaxed/simple; bh=7bxGGrwy7ADoItlO5F179rXv5QMI12FsyxWdtwJgFBs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlafMowVDrPxn8da8oVhlFX7kyylcG1c8WBviHmvgFpL8wG+waoALsecUBtzKI2bPE4/aT3zKPPBodr6BOVHBnLBjujQqWg7kt8KyJeQZ8EgaD565A8EsIgX4FpBhnHZ5slyOrnaqV6Ek87tw9lxEchnkPO8VhjQ5ERVAzZt1M8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jYEDxxYB; 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="jYEDxxYB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A0141F000FF; Thu, 17 Sep 2026 17:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1789667887; bh=In0vvhSAnSzoXcvD2Z0xMi9YPk2G/GTCylF8n0fHwdk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jYEDxxYBUYcZ9nOtieagwqfFLMLqpwMPktZ92KuLVn1u4eEpQB2hBLjitXkn8PUt4 tW0t+/qbZ1H+a4zSmuFy2yNUvDbmuw7aZUCCA+0KjD33fuM0uMCAR/jSG/LAofv2Vr AcDUDohtpeuMAzwlyn5myhsweam0/1/4AKUky8MY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Rosen Penev , Fernando Fernandez Mancera , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 6.12 0241/1102] netfilter: nf_conntrack: use get_unaligned_be32() in tcp_sack() Date: Thu, 17 Sep 2026 16:03:04 +0100 Message-ID: <20260917151545.642384111@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260917151539.408551884@linuxfoundation.org> References: <20260917151539.408551884@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.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Rosen Penev [ Upstream commit d3bf9eae486490832bd08fd62ab0ac601f346bd4 ] The timestamp-only fast path dereferences the option stream as *(__be32 *)ptr, which assumes 4-byte alignment that the TCP option stream does not guarantee. Use get_unaligned_be32() instead, which reads the value safely and already returns host byte order, so the htonl() on the comparison constant can be dropped. This matches the existing get_unaligned_be32() use later in the same function. Assisted-by: Claude:Opus-4.7 Signed-off-by: Rosen Penev Reviewed-by: Fernando Fernandez Mancera Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_conntrack_proto_tcp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index c289bec0c7c72..91da35e2b0d8d 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -405,11 +405,11 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff, return; /* Fast path for timestamp-only option */ - if (length == TCPOLEN_TSTAMP_ALIGNED - && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24) - | (TCPOPT_NOP << 16) - | (TCPOPT_TIMESTAMP << 8) - | TCPOLEN_TIMESTAMP)) + if (length == TCPOLEN_TSTAMP_ALIGNED && + get_unaligned_be32(ptr) == ((TCPOPT_NOP << 24) | + (TCPOPT_NOP << 16) | + (TCPOPT_TIMESTAMP << 8) | + TCPOLEN_TIMESTAMP)) return; while (length > 0) { -- 2.53.0