From nobody Fri Dec 1 20:51:19 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 4ShlbC3HZYz536sZ; Fri, 1 Dec 2023 20:51:19 +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 4ShlbC2qNpz4TJr; Fri, 1 Dec 2023 20:51:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701463879; 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=kGq9zEiSDYlXDOrp2EPNhw+6a1w52SA5zRfNqgVomUU=; b=V0iTyOl4DvZQtyP8+h5Y3iYQRd2COfG2BzNP8R9OomMGDX5shD7h5WAVhg8b87Q8+thoub u/1A5y+o1639yarfYauib2GfxwCpqB+p/e7H308d0o7MbVPK69ogmUzOnlA16k6P9kimxm jbCCc6rykdLmbBq4ty3zVszN/7dG+D8UPr7wwAnJvBFthNsWzQoBo7hy0KtTZlKuJBZwYf 9RZ6pKCdaAYf6fY3to+XF7DPmjYZXkYgV0qnNf1GLZd6IHIDN4uKU0Rslme4n0jJg4FzwR PCcSw1l8DCx2yogyT1tIFp3VVmk2fPxi0LpBWNJpkcMK+4oxCdHq3pGiVGLspQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701463879; 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=kGq9zEiSDYlXDOrp2EPNhw+6a1w52SA5zRfNqgVomUU=; b=U6wpqIXqlz1/Yn3FaISyvbL2RxKE9jllAlBgkZVESuHijvsh5IMUG+zcnl5mAD9O5rBsYW UE5Kg504JjH7hxgrkmdBdOeaxZdYob3HufSXmiDO4sfhr8Gf6XD+F9XdNVM7OUG2rllVl0 yirgPkluE0HxEsFcYLMQwo2WMZMZh/Xjjrsf7EJBBhM03PUW0RraXf04IakVl1YLSbsXWt 0IRCBc8CZ+6xLwthYuITrFTqb06VRla1zlSE8jtTGblSzJqEkjafNkaDDvfMeXNs2UoW0U 3UvyzNrZKGiF6dp7NgFAlqoZIxpJDcNGE5wVgnFacsOmV+yAdAfhTMhAcNWuEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701463879; a=rsa-sha256; cv=none; b=JUj+b4BYXOFsCRIc1Op59qEiUIkbGtmgwyWbs4M6ZGe/jcNWGHYiDtfdTd5/2zCQgiHhsJ 0iK6jyRIJkIEtZ9UR5mY4TawwD9iFUKLpaee5Sg6W678uCYC9ufy/1umembVQ67CASqVO7 is9uJ9plQ32EJFykzeZuXKYBNXIprlLHk9rjbTETW1wKo6r5Fyxoz0u81HEwiAL4fXKWZW PQhaJDAImpOD8v2GLEeWPKU0nWxeIe7iVGsvngAbrDKCma/7GNIKBueVLDu+6aUsOQ4mq1 iOKTmMrcijXY5iiFtGPvAqWY5u/HoHn7k1vg+DIJP1/Jw5yLQvavQYbSj2u4+Q== 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 4ShlbC1tnFzpPd; Fri, 1 Dec 2023 20:51:19 +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 3B1KpJRB093755; Fri, 1 Dec 2023 20:51:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1KpJdF093752; Fri, 1 Dec 2023 20:51:19 GMT (envelope-from git) Date: Fri, 1 Dec 2023 20:51:19 GMT Message-Id: <202312012051.3B1KpJdF093752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 957f014dc076 - main - sysvipc: Fix 32-bit compat on !i386 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 957f014dc076a7f74ed0c8c8699e6f39b55785e7 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=957f014dc076a7f74ed0c8c8699e6f39b55785e7 commit 957f014dc076a7f74ed0c8c8699e6f39b55785e7 Author: Brooks Davis AuthorDate: 2023-12-01 20:48:29 +0000 Commit: Brooks Davis CommitDate: 2023-12-01 20:48:49 +0000 sysvipc: Fix 32-bit compat on !i386 The various time fields are time_t's which are only 32-bit on i386. Fixing the old versions is probably of little use, but it's more correct and in theory there could be powerpc binaries from 6.x. PR: 240035 Fixes: fbb273bc05bef Properly support for FreeBSD 4 32bit System V shared memory. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D42870 --- sys/compat/freebsd32/freebsd32_ipc.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/sys/compat/freebsd32/freebsd32_ipc.h b/sys/compat/freebsd32/freebsd32_ipc.h index e74f4659247f..4ff8af359428 100644 --- a/sys/compat/freebsd32/freebsd32_ipc.h +++ b/sys/compat/freebsd32/freebsd32_ipc.h @@ -43,8 +43,8 @@ struct semid_ds32 { struct ipc_perm32 sem_perm; uint32_t __sem_base; unsigned short sem_nsems; - int32_t sem_otime; - int32_t sem_ctime; + time32_t sem_otime; + time32_t sem_ctime; }; #ifdef _KERNEL @@ -73,9 +73,9 @@ struct msqid_ds32 { uint32_t msg_qbytes; pid_t msg_lspid; pid_t msg_lrpid; - int32_t msg_stime; - int32_t msg_rtime; - int32_t msg_ctime; + time32_t msg_stime; + time32_t msg_rtime; + time32_t msg_ctime; }; #ifdef _KERNEL @@ -95,9 +95,9 @@ struct shmid_ds32 { pid_t shm_lpid; pid_t shm_cpid; unsigned int shm_nattch; - int32_t shm_atime; - int32_t shm_dtime; - int32_t shm_ctime; + time32_t shm_atime; + time32_t shm_dtime; + time32_t shm_ctime; }; #ifdef _KERNEL @@ -142,9 +142,9 @@ struct semid_ds_old32 { struct ipc_perm_old32 sem_perm; uint32_t __sem_base; unsigned short sem_nsems; - int32_t sem_otime; + time32_t sem_otime; int32_t sem_pad1; - int32_t sem_ctime; + time32_t sem_ctime; int32_t sem_pad2; int32_t sem_pad3[4]; }; @@ -158,11 +158,11 @@ struct msqid_ds_old32 { uint32_t msg_qbytes; pid_t msg_lspid; pid_t msg_lrpid; - int32_t msg_stime; + time32_t msg_stime; int32_t msg_pad1; - int32_t msg_rtime; + time32_t msg_rtime; int32_t msg_pad2; - int32_t msg_ctime; + time32_t msg_ctime; int32_t msg_pad3; int32_t msg_pad4[4]; }; @@ -173,9 +173,9 @@ struct shmid_ds_old32 { pid_t shm_lpid; pid_t shm_cpid; int16_t shm_nattch; - int32_t shm_atime; - int32_t shm_dtime; - int32_t shm_ctime; + time32_t shm_atime; + time32_t shm_dtime; + time32_t shm_ctime; uint32_t shm_internal; };