From nobody Fri Sep 22 17:24:51 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RsfKJ0Phbz4v8m9; Fri, 22 Sep 2023 17:24:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RsfKH6h9Pz4T7q; Fri, 22 Sep 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80N9uMu7FtA276pfE9dgM1kNaaaNgsukA1tRARYohRI=; b=YCeHNu7VicmFuujNwaQkLsevKoGVuFhk5WTzoi4fim/lvHjEzyBKhvRCkr8+Xtuvm0FCKw 7aEzFeaqndyHsjqYtcRYzdo/1MmNF4+dFeHWlLHLble8J/2Tx3zV+G9bFUdWx5JmmIsvw0 B16B4M4t9CZ+t18ZjXjsRXgU8Jh4HwbQfufVEVUtbxI7RnHO41OOl9faEFFl3ffXwBzI0/ 5bqNLb1RdbnVJ68pZQt1A8/0+JAUYHO75CtgDPgGKxqRAxrGRfaAMpDTT3ESvsCvTTJkCH ta4DzSPaxiKl2xXjFNmxwg3e5YBSSVwXWRPVL2OIp9l3PtiryIGRFtvR82Ek4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695403491; a=rsa-sha256; cv=none; b=oC6f2Tz/JeJCgmkNFUruYJXt2YO2o4cnKE1bNemYfa0hKbHc3t61T2i/TuHl5xxrK717AA swK+KbkWs7jxMzYiv172b7RExOVeLqAkzra56VArrodHQLbpd41JJU/M+KDnUmfyIif0bk xYJC5Zk4n/w+Kgfdk2zKqTc2MBHxxNjQbyl5j2h+i4MkN6jQfuDYW5/vsEgBnC8uflnR/t jbNp8/WRYvBdOoIl42IXDDL+/VDQNWZTFM0n9D1TWdytIOEGPqk0UIfeGIX0wg/n4h4s1/ JQ/FLCafGzUY/85uEoXXk15kVMQXCQSKaAPXItKmcL92ChZXeiNq06Ghz6WGhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695403491; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=80N9uMu7FtA276pfE9dgM1kNaaaNgsukA1tRARYohRI=; b=BenqFw/SDa2rwX+LK4fWJHO0ACHK0IALaTrVdB18aCU1YvLQHm0o6PBypAOY9AMoidkFTZ /0T4nba4dOZpCd351f/Q0fOizevf4oPB7VghEvwVOyI7EUWpNk2neQIMSqMBpeD3gjANmT UMH1+h17heKMWkTUW2e6nUrN3pBxNI34L3MBPqq4mQLGXfme/KiFqmtqwiGYa52NDBGY0Q S/Rwk1Z/QStDkhGvfNiSjuzWHrSpfGTZkTY+3gowFTffr9A0u9Q9UKJ3MMdIsIy6sf2k34 lZQ9mjss3ftxOZDxxEMGOfBIvlYvCidjSmw5FDEKO3qy6k2h6795a3O14fTomw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RsfKH5kkKzWPw; Fri, 22 Sep 2023 17:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38MHOpNM097037; Fri, 22 Sep 2023 17:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38MHOpBM097034; Fri, 22 Sep 2023 17:24:51 GMT (envelope-from git) Date: Fri, 22 Sep 2023 17:24:51 GMT Message-Id: <202309221724.38MHOpBM097034@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: 2209676efe9a - stable/14 - Fix padding in struct tcp_info List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2209676efe9a23d9411fa0314b9c6bb285baefc1 Auto-Submitted: auto-generated The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2209676efe9a23d9411fa0314b9c6bb285baefc1 commit 2209676efe9a23d9411fa0314b9c6bb285baefc1 Author: Alan Somers AuthorDate: 2023-09-17 14:22:08 +0000 Commit: Alan Somers CommitDate: 2023-09-22 16:57:03 +0000 Fix padding in struct tcp_info This structure should have the same size across different FreeBSD versions to ensure backwards-compatibility. It has since stable/6. But two recent changes added fields without compensating by reducing padding: 945f9a7cc9dcc071bfcc702748fbbb11087ae773 and 22c81cc51636cfebe94e0979eb31556d87775938 . Reduce padding to compensate. Direct commit to stable/14 because we decided to break compatibility in FreeBSD 15 in order to add more fields. Of course, that decision could be reversed before 15.0-RELEASE. See the review for details. PR: 273902 MFC after: 1 week Reviewed by: tuexen, glebius Differential Revision: https://reviews.freebsd.org/D41894 --- sys/netinet/tcp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/tcp.h b/sys/netinet/tcp.h index 2b898d062b0d..bfb825930c66 100644 --- a/sys/netinet/tcp.h +++ b/sys/netinet/tcp.h @@ -434,7 +434,7 @@ struct tcp_info { u_int32_t tcpi_dupacks; /* Consecutive dup ACKs recvd */ /* Padding to grow without breaking ABI. */ - u_int32_t __tcpi_pad[14]; /* Padding. */ + u_int32_t __tcpi_pad[10]; /* Padding. */ }; /*