From nobody Thu Dec 14 20:25:43 2023 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 4SrkPg29M4z53jWb; Thu, 14 Dec 2023 20:25:43 +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 4SrkPg1l2Zz4TqB; Thu, 14 Dec 2023 20:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702585543; 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=NiAI/oJM0obWa/a4Dc3L41DtpBV+cD8dr3x05m/4Is0=; b=uzIOqgEt+e/n8JjUKYYvtVcNDe5X5VgElLUg3BkDBdUZMOQcxa4YKqHi7JQeM/JsPzXktu BbUazZLHdQI1qURjbcn4B2zzULXsiABwzQZZqtAmOTXFCBQbx6lWBkmG8hOSSyv9mbBdS9 HrixzwiKst/HvXyxuSqQFtPkgAZ1zn1vcN/XzJlg7o8frfrpuTl4f+HcMQdwCdzAVii+dG zAlF0f3fJt7690NnEr8OhPFaVDcWYcevAlfydb3P+Gn7+7eYZGLILFuKPlcUl5bxI7k6QL 6gslP2glR33znUJoThrrZVKvD7SPIfyFmsK9AceWeLLk7uVkdlmfPTUNAN9D9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702585543; a=rsa-sha256; cv=none; b=T4lEfhVylpYAin+kipVbWyge33awB6dGXhYL3c3ry5IvQ5WXTPEvXjEy8K+Z6bEo5Hpgof oOomiLu8UByGbvaL6inkgus96SJyVbJNNxkVKtTNZO4yO4LWQsonfuEKSy3gQBGOHJ+Fu2 +7vPaGXLnxvw2wIeo2sBX8BtXGEWzb203AQ2q7UyP2NwWM0XVkC7WvORgtPO70/9Qs+iYX zlXVe7Z/9D+lESd0WUpimeHWtvHk63hvxRQpUN3DQbUEUY6xPLt9JHDVHHL/blnX0ya++h XckvaZjzZgn6jLqn1pRbFsa8qqM7yYm+b3QkpHt/ja97uBEBGyFBWvuzZaLYbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702585543; 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=NiAI/oJM0obWa/a4Dc3L41DtpBV+cD8dr3x05m/4Is0=; b=GlbWaOTdyASP/vC4f1iU5yjZWsW2Yszmx4ic03qUvQ52WmHRxRwDFcBBA611YDtxKDLsH/ Q4KnWOdFgH2eNYcNsFwGPjWxbtQz80N+SWNvN5yuFlGHxclj3l0MZSYpeflFh5oZBpXTdR HDqQcTNglcnx74C2V3N06iNbAy1pO+iHPd+e41NzJZ0MfmK34vUnV18gktn8OhR+TkO+y2 Qjy7RttRdttAoZ9wQBmQLAhAdLDX/OUxbau+Ydab/XhkWuR0AVYEtaDdK5/AtSLbqf8KN8 fJDfaGoBMx83V7RBuNPMpugLyyqSrLEL2vRoGMY+ePOtzkLt66yF5mfhByjsmw== 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 4SrkPg0pkLzj0l; Thu, 14 Dec 2023 20:25:43 +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 3BEKPhR5052062; Thu, 14 Dec 2023 20:25:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BEKPh9t052059; Thu, 14 Dec 2023 20:25:43 GMT (envelope-from git) Date: Thu, 14 Dec 2023 20:25:43 GMT Message-Id: <202312142025.3BEKPh9t052059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 9ba8c825a392 - stable/13 - sysvipc: Fix 32-bit compat on !i386 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9ba8c825a392e141bc05efb71595f949b00a3719 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9ba8c825a392e141bc05efb71595f949b00a3719 commit 9ba8c825a392e141bc05efb71595f949b00a3719 Author: Brooks Davis AuthorDate: 2023-12-01 20:48:29 +0000 Commit: Brooks Davis CommitDate: 2023-12-14 20:25:27 +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 (cherry picked from commit 957f014dc076a7f74ed0c8c8699e6f39b55785e7) --- 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 e31fef9a38fe..5ded02045875 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_ds32_old { struct ipc_perm32_old 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_ds32_old { 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_ds32_old { 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; };