From nobody Wed Dec 13 23:23:00 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 4SrBNj0Fnsz54TRG; Wed, 13 Dec 2023 23:23:01 +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 4SrBNh55xBz3d3d; Wed, 13 Dec 2023 23:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702509780; 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=+EHxpfQ3l7hji1hi43GWdX6O1K6iKzNC08B+IAMutTA=; b=WhArmJ867fz/vImqRgdVXFmVcgfyzuHOUG0H5+DwzuGbthaKgV6Io8QAcC6f1v/Y0Xqlkp O7wdAdaW/CaYwJFsrePxDhht6zkWOq2C4i8OTY/TJTa4wcQoOc12rgTNhKYaXTIxL2+UJC TE7ckOyv3lfH7eONi1F42/LvD+REDHYFoBaYqTdCRtwji3O4lc/KWwJg5G2h3U6rQtEm3f ri/5PJdqj93lyeV00B9jZTukANAgucf/9+209SglrlVKp+6RWie7aCdkkfs6JxIJ/s223m +ZX69KnsIVEqqmhhel5LH/Q1pZP9DCQhaA+dboVp+u+RvkBr3pA2haNYnHDE7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702509780; a=rsa-sha256; cv=none; b=dhWmeCDh3z3cE4XxcEyv1djAIYFzDKp0ZpF//TGTzLp5Q4gDr1E2Pm3bHmuMNiwuy3NFku lpYB7uRbj5xiq2wSJKTatlF0amuk9z6oonvx8hkEDf8WnsN6lKZRfaofWfsZzcYeeeqz6S GB+4eDfF8Zn5nwVzwTfFK9t10ESSFA57ac0iU0tx10xug/1OoTeq+V5zQ7zH8MwUrQHTVH 7mCiS1TxDu/O4KTMqG2jr2Pt+wuZ8fu2czK+9R2cUQkd3XzU3zBhXqkcbyR8EJbn1OguOV mDmn1PYIiHccLBx0XG+VbL4uxX+BuTiURold+pMoe3JI18y5Vs5MEq7saGHtHA== 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=1702509780; 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=+EHxpfQ3l7hji1hi43GWdX6O1K6iKzNC08B+IAMutTA=; b=pLEnDmXTdJ5AU9PzNHhbMDTZ5hW9OeP8RjGZN6XHpieSiywp2a0r0WAgrB1PR3hGkIbHRq 6HEVhnqKdzPC5w1Ol+ZLD06g8d482VEmjayqb8K7U9zoXBEyBa/6xFzNhAxZ8TofI2U3N/ Z3Lk0AFWsf/tJ3sb6rmWdKggSzRqqV+gJN7tFhZnMADbnGksr1aE20OTfjQOS5p7vbezaS bjd5aLRijQdbUOM9vfs1RXIQQH60u3m4QVLPeNPDizOJXcQd8QCfCAc+u7mu+NhsWvaw2m 3oRo679ANVkHLpVvklxEZbVEzXmWNo7s+wFbftqPxT6zWqUuiu+bMqTis8L7hg== 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 4SrBNh4CM4z1HyM; Wed, 13 Dec 2023 23:23:00 +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 3BDNN0CD024974; Wed, 13 Dec 2023 23:23:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BDNN0qA024971; Wed, 13 Dec 2023 23:23:00 GMT (envelope-from git) Date: Wed, 13 Dec 2023 23:23:00 GMT Message-Id: <202312132323.3BDNN0qA024971@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: cc77811bf02c - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: cc77811bf02c4a32c5303fc9de1e4596bbbc94e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=cc77811bf02c4a32c5303fc9de1e4596bbbc94e1 commit cc77811bf02c4a32c5303fc9de1e4596bbbc94e1 Author: Brooks Davis AuthorDate: 2023-12-01 20:48:29 +0000 Commit: Brooks Davis CommitDate: 2023-12-13 23:10:53 +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 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; };