From nobody Mon Jun 8 22:51:25 2026 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFEF42D29C7 for ; Mon, 25 May 2026 21:58:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779746339; cv=none; b=TVCj9VVfCFPsw4vuvvh00U5RHb3vx9/EuZf0sm1xYICTStetYeAdtKKb4kbbfescCEyGV5GSxfGjWDcNq+mQCawnUPs0DkS7UnDT7BZUZohZWAniUK1UqvRA1UJ52SZj6zI68X9eJd8sB0AwS9SEwVNeHFue/Zavc1gXDLa1Jtg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779746339; c=relaxed/simple; bh=CrEqzrWNX5i9EDnlY0vi2gqf/6FcRMTl54dk6duo848=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=qcPh2aUs37tyDYEcXB1z6Bq7ECxHLjSmdKCXwc786+vQyICB9MIniHwcegGMrDXmVBP82Bs2NXdVBcjtgG5eq8WYRLth/jeQW3kJdRjQS0imrnvdDlY+pGIalTb30EPdKD9PyXHIhhJ9MWnhXyIsWUS15gy1YIZjVzyxlNcf85g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=RYhwx7AA; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RYhwx7AA" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2be1dd4af34so87751595ad.1 for ; Mon, 25 May 2026 14:58:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1779746338; x=1780351138; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=3K1QSVKO4xxnbI4UIG0vqZ1FFpQ1DWBA52T8EZUsAFE=; b=RYhwx7AAWTMK1flituky02TvetZupOX2fByR8+cIoa36cF2i6ozHKSfQtmDVer4NPd FeOsw0rvrx+xsKy6OtUS2jgY40VYq0eP5hiOqeJTAVPtsddls6ItKDWMeEc9UCM0MWAw A7VUOud/hUrm0U+tA8ZXTfga+xASs+94mjWGCmiDh3NnT0fg+uhHxxT7Fmw4iPSVTZUH Ahl2Fhm0iWyFR6qy0F3BSO75hEdVEjm+5d+gZWvBJmjLBuN9e/w/GVehYrKEgMrbK6uK jJOWjMuuAA/LHRd/t11d/7MIL+m/8zUv2z8BnCNeBR5MClnXd+TAyBjV75th9iDEw0ZG EPng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779746338; x=1780351138; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=3K1QSVKO4xxnbI4UIG0vqZ1FFpQ1DWBA52T8EZUsAFE=; b=OpKQZo36zs0eVtqKtN2bJV6mRPacV1WUgeb+xRvSfEEGaQrjRz4szOh1X/Ik5uCVOc qfLOaFrZ67RZqyN2HNnt2C+TIdV1XJz0HrCW8xVfy+aBQFfuCa5Y3rYQS9gLS6f6/dtP 9FqpUPUJLB3eCPe/CgqA0cW4hJ2wR9A5ihQh43KSu9BkIByjGzPMtcqAKa3OotnnfIQA hmZ2QbHa4nP7H41mFchRVC0Ln/mm79hVE3GapXw6dNKpVMk4/DwJZSzCHjgmnPAkatgx wqvIqNbpqdiUGYC6VLMLkFyLVyhvIj4vqMwIJR5WcisbZtA2bD6SBn1jF3xTi0i3Hxt0 86fQ== X-Forwarded-Encrypted: i=1; AFNElJ9k8SfYrGNbdubf+NMhezU7c+FC1TVBBxbz5B5BjHY5RLDaZCTDwabtCRlnA+gETQfrf5krfQ8g1CCg4tc=@vger.kernel.org X-Gm-Message-State: AOJu0Yxsv5b1R6u6cKkDy4OVyYy4gO+cqBm5sgjNJfKvMkoE7bvxamIV N4CIvPrihlUp0QNtfS6B18aR6RZMQEYYnkjYpszcolSLmlMa1D+AoGXq X-Gm-Gg: Acq92OFSlGnD22OSK6RvpiIUT9ajRDNEGogWsFMvhND9V7JxiPpblVKv935q6DM6jlF r5/1E6W6F5ss6wScI+DTfTamHUGYRYGiJrskwnbFQ/D1gSdM6aqy2A/McMQqEUdhAda4ZN4T7Ik orrV4nNvyEWfXJd3IihcKtTgea4LzRxG1RHuaUVsTKnRGNL9TmLhs29yEU7tmhVSZW9PiAkNYoi BvefjBbrJUazEB0ZBHjJ/s0n2Xjml02EXZixfScCIwdKCjHX4HGWLLar6E9xSXmZak1Iin0nBFt WmbciwZHYLQmV+aEg8XBmK1/hm/tOdomDtP2om3kTEQRwU9XisFUi7Whn5tXP/Sbtcv1z3ylxOa ClAuaALGVT0t/5YFlhc7pAclr0Fbl5EL6Fb7aBOxDT1UolLXi4EZ5xHEmFfOyKQAOOQQ36M7F58 E2V2o+LMQqZtQw6BjNQmamQjxHDUJR98wLH0QPaBXT0lTgBeHfof/UCDO43rOSiHqBfz1RdVyoQ y5cdLF2Qc7fX7Kq3xvA2CW9XbtiGNsxOdQL8Co0Eh9iFw== X-Received: by 2002:a17:903:15cf:b0:2b0:7531:b61e with SMTP id d9443c01a7336-2beb06920femr168393165ad.41.1779746338054; Mon, 25 May 2026 14:58:58 -0700 (PDT) Received: from ryzen ([2601:644:8000:5b5d:7285:c2ff:fe45:8a32]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb56b9fabsm131699335ad.23.2026.05.25.14.58.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 May 2026 14:58:57 -0700 (PDT) From: Rosen Penev To: netfilter-devel@vger.kernel.org Cc: Pablo Neira Ayuso , linusw@kernel.org, Florian Westphal , Phil Sutter , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , coreteam@netfilter.org (open list:NETFILTER), netdev@vger.kernel.org (open list:NETWORKING [GENERAL]), linux-kernel@vger.kernel.org (open list) Subject: [PATCH] netfilter: nf_conntrack: use get_unaligned_be32() in tcp_sack() Date: Mon, 25 May 2026 14:58:40 -0700 Message-ID: <20260525215840.93217-1-rosenp@gmail.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 --- 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_conn= track_proto_tcp.c index b67426c2189b..8993374c9df2 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, unsig= ned int dataoff, return; =20 /* Fast path for timestamp-only option */ - if (length =3D=3D TCPOLEN_TSTAMP_ALIGNED - && *(__be32 *)ptr =3D=3D htonl((TCPOPT_NOP << 24) - | (TCPOPT_NOP << 16) - | (TCPOPT_TIMESTAMP << 8) - | TCPOLEN_TIMESTAMP)) + if (length =3D=3D TCPOLEN_TSTAMP_ALIGNED && + get_unaligned_be32(ptr) =3D=3D ((TCPOPT_NOP << 24) | + (TCPOPT_NOP << 16) | + (TCPOPT_TIMESTAMP << 8) | + TCPOLEN_TIMESTAMP)) return; =20 while (length > 0) { --=20 2.54.0