From nobody Sat Oct 07 02:48:57 2023 X-Original-To: dev-commits-src-all@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 4S2V9j6C9bz4wY7L; Sat, 7 Oct 2023 02:48:57 +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 4S2V9j5hnnz3LKk; Sat, 7 Oct 2023 02:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696646937; 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=uzTXzgUPs5Q2uX1rp5rKsTKMRXZQev6yF4CBai8FN/A=; b=j+hRLa7SlXl/y7RaCA1PMN6Jbu5RsejBwJV8vuAw+aHz50tD3G1Z3e9zVzM18OryZcR37n ngsZSEuVdhz6re7EO7/lkMVieAxiVTYXzfcthFzyPkxfJiJGzJOQCwm99C08tr2GISy3Wy 65pocxJ8TUTVINBYH1DAZMYqqUVkYVvu5loyZ9C5QKYQBFzn9DLbPmW+4tG3L05z+EUdNX rP89yaQS5lxtrUBKSrK0hJpPJ2uWhk1RmGrNrTWBtsdto/yT0TNhUIqm3QWyzPCA5+kAAs GgDiLGSiuDnrm84B8l4uzlerT2sJHANRuI9p56nNe7p5xE+mfUKArE7nrfgjhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696646937; a=rsa-sha256; cv=none; b=WeekiBoHcPgEYnyoD8CtlMFTQEoH4HgfRnHxGK76PgNgoioB+zPdcN7D0F6Tm5zAPK4c26 Ot8bq6OlF3JANjed/+SSYklthVTRd+cl0vnLPcETu9gklPbiIhzHbij/1tytlNDh9F/yTv 6DTIVHUVoQYq/EgyQEEbZewe+b+SXUIczzaN5mmZ3sh90kVfld6/E6Y2WCyt9jLpFZBIho dAZPWlayAUyjaKQGG5dPwZrmEDaSuuR670LfYwiQdf4OJ+EtJ7k1mKVUIEMlwezbWVrSWN vldnZonKAmC1Ka844U3vOssFL3D56AReB3LuFDSEIjxPM3hsaWT+wm4sz/0rEQ== 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=1696646937; 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=uzTXzgUPs5Q2uX1rp5rKsTKMRXZQev6yF4CBai8FN/A=; b=fprliSh1q2A/x65jeslsxcnngBxS6xf6JHB/GYJuZpBfhuodypLmurSUUQubfJVF/BRl/K JV2ftLAYmCMiY2zLduu7Pzo9ZRT/dUsjMrYwb50PskzAUtxV7pHhTJtWkEccg9hL7ZQ1B+ WvvlAXy+itMCT14fmU6kXTP6nsK/SvothFUDGm0aYJppnw/C1Rt/IY4EVeDY+ZX/WJYv+k L+ZoNYEUZNa1Grv34hgVnVsjz3fdQ86BDXQ7tVHFj23MIn7wWJp+tinkuzTPCQrFF3cdcT plNBVsyTFMJNmpJ3c2DosPw8N382kz+rlh21SF57G9YB86TxrJdiC+sM28WYUQ== 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 4S2V9j4mKNz1Csr; Sat, 7 Oct 2023 02:48:57 +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 3972mv2L022988; Sat, 7 Oct 2023 02:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3972mvNQ022985; Sat, 7 Oct 2023 02:48:57 GMT (envelope-from git) Date: Sat, 7 Oct 2023 02:48:57 GMT Message-Id: <202310070248.3972mvNQ022985@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: d67558ef3149 - releng/14.0 - Fix padding in struct tcp_info List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/releng/14.0 X-Git-Reftype: branch X-Git-Commit: d67558ef3149c02223fd15206c8c7766f6891be2 Auto-Submitted: auto-generated The branch releng/14.0 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=d67558ef3149c02223fd15206c8c7766f6891be2 commit d67558ef3149c02223fd15206c8c7766f6891be2 Author: Alan Somers AuthorDate: 2023-09-17 14:22:08 +0000 Commit: Alan Somers CommitDate: 2023-10-07 02:48:17 +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 Reviewed by: tuexen, glebius Differential Revision: https://reviews.freebsd.org/D41894 Approved by: gjb (re) (cherry picked from commit 2209676efe9a23d9411fa0314b9c6bb285baefc1) --- 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. */ }; /*