From nobody Fri Apr 29 23:12:35 2022
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 67BB11ABCE8D;
Fri, 29 Apr 2022 23:12:36 +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 4KqpDM4nlpz3wFP;
Fri, 29 Apr 2022 23:12:35 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1651273955;
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=NhAMPoYv04N210vdWv38vx54minXNh/ra21lGAz9vrE=;
b=OQniqlLBhCwtaH1aqgSBb1gGrqhSA1wq53QP0yNgpkBkLRVO+sfB8RmSr8tgVYzoaSPdKY
zzitvLMsD9Rn1WoaIQ9RGJU/Koy73J5qs07hjK7nt+Z17hGzr87e/9Q2jKUf7m5HSaT88I
MeNHRZFHYBPICo4JB8xvUfHcq9XSD6tR16hJhKoyBHSFtSKVNkmfrbIlVGuD/0nSokcp3h
x/8QXKtJCUJaUWRVNcVHO0kAFT2F34Y9nVa+I6x+gZ/dYlqhtvxRAabP7Yb0sy49hChCCA
Ck66CJnnrIOuP3oc77kWjC8ry1a4h8Q/1vgoh1Qw6gX1KW0D08utZd/uBFlekg==
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 4DA8716303;
Fri, 29 Apr 2022 23:12:35 +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 23TNCZRS044847;
Fri, 29 Apr 2022 23:12:35 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23TNCZIR044846;
Fri, 29 Apr 2022 23:12:35 GMT
(envelope-from git)
Date: Fri, 29 Apr 2022 23:12:35 GMT
Message-Id: <202204292312.23TNCZIR044846@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 62322552c4ac - stable/13 - freebsd32: Fix layout of struct shmid_kernel32.
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/stable/13
X-Git-Reftype: branch
X-Git-Commit: 62322552c4acbb105644cd1b189e224ee4597a09
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1651273955;
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=NhAMPoYv04N210vdWv38vx54minXNh/ra21lGAz9vrE=;
b=oiqgfHch3u8nG5q+Na8XgEKZ+4vxlKmGHoDDSkMW6+RVZhJ5pGah8XWeEKMCfhkwuvva2A
37g+C/zHHWwwm/Dd7ph2Tw8bArVjpXuAZF8V9vb/+ohxrkH7Q3l17Nt7Qc45o4f8wjchVW
EL27C+PxNBBCJgXF8rlpwBSFX2mBfZOzbOFRlMIu6lScXyFnXs0YVJLMt69cR/rxUcTOel
7DwiHZ43pnbFQGYbGrdJDDJiGL7RjQpuoUee0p2ZEs815ScbEAp0Ry4JmsIkZgLnfz7sRE
6ne3JQt99KnWLWROI7Ubhooqw9RGVB5N6R6FF1WRYOS9SLDKlj0aT9uECniH+g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651273955; a=rsa-sha256; cv=none;
b=AwG4jtsKjzitdjLmxznW+oI+YEVClmAmxknLAt8dlLrqnPsvEZ/IG7gbwNRFe3v6254S7K
IjXnx1av6r2Tp+R7P1qaheWubnaZCnr3yM76UrIb4VT2pHfZdXXTfN9wGHN3y25zZC879f
utivtya3bfpMsGd+JTcLzPOc/etStBKBj34VS596EW2QvWJdjYBNxU8lyvWvO6XiY3qpw9
xVPHPv+6p+BA4WOYBjGou8nDzZ4OvSYiW0CNy2sNBoQGPpmXIQEa4QdqYvtSKcallcYeOn
crLu/OLH9RvtCYIpkJmzAVdeLT13xibRGaUYX6JhSj7IQHwtb7vc9jnvWMwTlQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch stable/13 has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=62322552c4acbb105644cd1b189e224ee4597a09
commit 62322552c4acbb105644cd1b189e224ee4597a09
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-01-18 18:42:21 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-04-29 23:02:46 +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
(cherry picked from commit da7fc5c33f9a4c906068a9a43f43f8d295100418)
---
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 ac469585cafe..10bf60320295 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