Date: Fri, 22 Sep 2023 17:24:51 GMT From: Alan Somers <asomers@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 2209676efe9a - stable/14 - Fix padding in struct tcp_info Message-ID: <202309221724.38MHOpBM097034@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=2209676efe9a23d9411fa0314b9c6bb285baefc1 commit 2209676efe9a23d9411fa0314b9c6bb285baefc1 Author: Alan Somers <asomers@FreeBSD.org> AuthorDate: 2023-09-17 14:22:08 +0000 Commit: Alan Somers <asomers@FreeBSD.org> 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. */ }; /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309221724.38MHOpBM097034>