From nobody Sat Mar 4 09:12:54 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 4PTJyv29Bfz3vmrS; Sat, 4 Mar 2023 09:12:55 +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 4PTJyt4BWjz40SX; Sat, 4 Mar 2023 09:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921174; 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=oI3Sc9GP/yqg9a42hUb/lCIHDS0ZuHOX6c28DjbvsgI=; b=QF/V84+6WjWbG4+37PFZGrmluMeGx8Nn2PeVASCrM0ZYqT+i4eRsBYfZaIgr/FdCtzClhQ BcaJ7cjaiMFgR/rvyM2A9J5QeSEQGZeA1AlWm7nGUhjbmCiKYR3iqm0xagZkl/K1GSgoq9 IhFSOovxR1QsTg0bmu0OeGiDdaXxJI4WiKVUTR+ZVRS2A3CRqWIK1i1eAnSDnUDgoeWIEN 80qd8bpwECQ/cl/URZ2CfHvPyIPBFavSgHF5gwm7Y6GBcglbBXXc1oFU2r/s8b/zBkdQou PDQ/QlhXJDO1a7hJKbc+XMxEfhaGa12QRXJ8g1YGAe0TMReU0gK5946t/FNBAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677921174; 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=oI3Sc9GP/yqg9a42hUb/lCIHDS0ZuHOX6c28DjbvsgI=; b=OTPyrJOUO7gIwEo2QxLvvGmv3gHg3VuszErsseM6Urlg+xjh7KKr1iGFVxvVxfYDKtbKiQ x6MLJr6b4swzL9AHwKzm3cSXVEbjzFEqQiX8cjHpFphTBFqJa3RnDLE/q8v+BPETjb6bI4 L3pdgAYfqTGXV/d8e/UJUEFUCbMlEnhz+x+DGGgRq+PIPjjvKQUy9J6W/TOz1JW2W7WIEa 0wiCKgnAf9aXSFwBt/fFMZm9NmbFCLFsLiCjnZS/uwaT6RQ+g4mr6DkTsY1eKB6vUiwx0a 6argyNWyWT3KWRuDaCrbcN4heuPQhXvi0wLhEBxOe3ykoQLXuG3B8A3h80qasA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677921174; a=rsa-sha256; cv=none; b=n/F/neahsvIRw+ZXLf6GO1jqwZo4DiOEb2y8yXqk+JgIWTSwptcysAHZ0kLtnA/HBBl+lb tMAT+blLAnOcD7/0ySgilIkPvpA/qsNp1UY3tSyT3u7TKqkE9NjkTWn2lTfnQSYUNaryOo /s2CKBocyuvW+vI432ZNa3IFQZiMpQPZ9xG58Xpw6oAKq2g0LhmGvVDySTuaf2mxh/BACl yGjsuRTeBZSrQe12MV/8kHxF7nV8DiS4pGQbWAlMJvLcXvoag4VF+PT867ZPSW8gql59Be VYSlkmvTeO5mAILYh3zS/FIFHDwOp7IlH+H906hEvK21uW1S+R886NeK9xG7yw== 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 4PTJyt1P3TzZJC; Sat, 4 Mar 2023 09:12:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 3249CsYJ079025; Sat, 4 Mar 2023 09:12:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3249Csks079024; Sat, 4 Mar 2023 09:12:54 GMT (envelope-from git) Date: Sat, 4 Mar 2023 09:12:54 GMT Message-Id: <202303040912.3249Csks079024@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 945a7f0d21a0 - main - linux(4): Assert that the FreeBSD size of struct sockaddr is equal to Linux 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 945a7f0d21a0bcbcce3f308e080f54dfb7da54b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=945a7f0d21a0bcbcce3f308e080f54dfb7da54b1 commit 945a7f0d21a0bcbcce3f308e080f54dfb7da54b1 Author: Dmitry Chagin AuthorDate: 2023-03-04 09:11:39 +0000 Commit: Dmitry Chagin CommitDate: 2023-03-04 09:11:39 +0000 linux(4): Assert that the FreeBSD size of struct sockaddr is equal to Linux Our code depends on the fact that the size of struct sockaddr and the size of sa_data is equal between FreeBSD and Linux. --- sys/compat/linux/linux.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index a4df46d7f9a7..53a874ebfab7 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -57,6 +57,10 @@ __FBSDID("$FreeBSD$"); #include _Static_assert(LINUX_IFNAMSIZ == IFNAMSIZ, "Linux IFNAMSIZ"); +_Static_assert(sizeof(struct sockaddr) == sizeof(struct l_sockaddr), + "Linux struct sockaddr size"); +_Static_assert(offsetof(struct sockaddr, sa_data) == + offsetof(struct l_sockaddr, sa_data), "Linux struct sockaddr layout"); static bool use_real_ifnames = false; SYSCTL_BOOL(_compat_linux, OID_AUTO, use_real_ifnames, CTLFLAG_RWTUN,