From nobody Tue Jan 18 18:43:11 2022 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 569DE1970F74; Tue, 18 Jan 2022 18:43:12 +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 4Jdd2761ZCz4TYC; Tue, 18 Jan 2022 18:43:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642531391; 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=47118kBbw6rGrdBswAjVX20JHCapJ77kl4I3U9ToOFU=; b=JtI0bZbStGP6uMRyc1ztOjZBeIWP4di/bUvmHG/5ugj1EITb4S9+C5hqxCurcABmbiuM1R Lihi3Rdh7uw+snpNol/n+90Mp4RR53kWLL5Bd6uxcydrbFVUxpVEYFXsxRs1TkPUU9TLzu r+ushFYln8pTE19G9GAgp1AR7xuvV0Qndrjc6r+P4GwjCsflCZZHP5Wt6ZfTS6DvF7NLwE L+njLWhsGAIwxrc+dbiF55Cg8r7QG0a1vSKaXpFciII8YGyzC2depfJddPbcdGuc/mxf9X rbEvUg7gGOkCLsoV9LR1utRvGIIvrg0NNrd3v3Ae/0Hs6OyDpCrdRlpkFf/v3Q== 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 64E0525F72; Tue, 18 Jan 2022 18:43:11 +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 20IIhBhY031278; Tue, 18 Jan 2022 18:43:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IIhB9l031277; Tue, 18 Jan 2022 18:43:11 GMT (envelope-from git) Date: Tue, 18 Jan 2022 18:43:11 GMT Message-Id: <202201181843.20IIhB9l031277@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: da7fc5c33f9a - main - freebsd32: Fix layout of struct shmid_kernel32. 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da7fc5c33f9a4c906068a9a43f43f8d295100418 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642531391; 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=47118kBbw6rGrdBswAjVX20JHCapJ77kl4I3U9ToOFU=; b=j3olYfXMMLCZ1/f2aOpFeNWM6JYubA4fuPFftpSVTH1ZdW6eO5/ylo8uM7K0f0zvgiL8j1 jedc4m9CrsN2JcpQnotf4EfNkS3T68dvyx6e1UPOBFpFg8aA9T7A6b2hHFFoVc2AV92GBn 29hKkIh8ASnvr+zePfPtjqp5EUjypaqchBxep5j1LRIpxebIPaUQDd5nFxBRDwIAcXtl37 UWKbDqv+NRqXg0J55MeN2xekoybhpVvn2oULP1azcSvOMCB9zE8Mgw1qdf+0AAIKxSxZ1i 6GCZ4VcrH2ajRzfGka4sPePz6Iop9n3R1uE4TjnpVCyHIefegmT33lWyJ4PpsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642531391; a=rsa-sha256; cv=none; b=x5AwGd8w8ZnkqX98ITafnzJ3ibnhPPylKGErmTUr803LEMxJnFCxCyIsDhH1/g1t3c7c/m N3zhDMEAYczz3x/UhAwNy0WM7menTjgBpk7zADgH1vUN6tNV6NVWrfy+eOG1AeV8BSTKPP 89+4Xr8VKCnCSWtB7EcTgNRuZU04KiB5ndXKIBWlgDidk98G8ivkEjiGQ8LsCOYbhJIF4k jMLnRkhRvFjNo6E4tiab48k9HWN+FYIcXDpWb6NfjWVxocXQhGnkgxFZ5IIdqDKLkw4oG0 9TUV8wEY1desdHUo7S51TEy8Zke03DQaJ52nvSbucZ8Kyq7lzFmny+uJkUrNxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=da7fc5c33f9a4c906068a9a43f43f8d295100418 commit da7fc5c33f9a4c906068a9a43f43f8d295100418 Author: John Baldwin AuthorDate: 2022-01-18 18:42:21 +0000 Commit: John Baldwin CommitDate: 2022-01-18 18:42:21 +0000 freebsd32: Fix layout of struct shmid_kernel32. The kernel pointers in this structure need to be 32-bit pointers, not native pointers to 32-bit integers. Reviewed by: kib Sponsored by: The University of Cambridge, Google Inc. Differential Revision: https://reviews.freebsd.org/D33905 --- sys/compat/freebsd32/freebsd32_ipc.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_ipc.h b/sys/compat/freebsd32/freebsd32_ipc.h index 6c34445e363b..e3677d186da9 100644 --- a/sys/compat/freebsd32/freebsd32_ipc.h +++ b/sys/compat/freebsd32/freebsd32_ipc.h @@ -104,10 +104,10 @@ struct shmid_ds32 { #ifdef _KERNEL struct shmid_kernel32 { - struct shmid_ds32 u; - int32_t *object; - int32_t *label; - int32_t *cred; + struct shmid_ds32 u; + int32_t object; + int32_t label; + int32_t cred; }; #endif