From nobody Sat Feb 05 00:01:19 2022 X-Original-To: dev-commits-src-main@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 0C77F19BFF9D; Sat, 5 Feb 2022 00:01:20 +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 4JrCHM3VT9z4sfr; Sat, 5 Feb 2022 00:01:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644019279; 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=cZ8Shv7F8hWRfomoQztORUXFsLu0J6sx883H8TuGSLM=; b=L1GJjQ4jEyPunRF9AdetbRFjz6mBUSJIanMDqSxjbIrzevDBmCdKRjpSiV8B32r0X/1uW4 qDqnkR9PGAQ7DbHhjtQcNX7YBxTE0Zan4H/2p1NRbdIs1cF+HUGIclBW03cxvmWr2VKZGt RjhReXtgDTlVAwsGORP1j77cii7bcJzfwOy5a5iUJlb4Y4x2yfBld1pmDS2iS3PH6nT21x v0TUu3Ksbu1XVq8WJo+CdhkpbbhikjADiYkpBYU4v/zLGrmKhIdHc4OZao4GtXsp1We83o khP5SbpP5P+6ytpuQk3/ths/LA2muk3DPKfB1pHYbT9UztlrKtViO9mUXPBOFA== 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 214EC15390; Sat, 5 Feb 2022 00:01:19 +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 21501JMt024065; Sat, 5 Feb 2022 00:01:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21501J6k024064; Sat, 5 Feb 2022 00:01:19 GMT (envelope-from git) Date: Sat, 5 Feb 2022 00:01:19 GMT Message-Id: <202202050001.21501J6k024064@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: 6bea696af25c - main - linux_copyout_strings: Use PROC_PS_STRINGS(). List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: 6bea696af25c606452515bc812c23b9f2614344a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644019279; 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=cZ8Shv7F8hWRfomoQztORUXFsLu0J6sx883H8TuGSLM=; b=Tm/wCbNBysNmuidG8Rtn4nUwZqkoQS/6QDPewQXa1mQ7Lb4KbKSx6aJfTa/ldGgjJnGgX2 txlvLkPyIhw2Ry5SntOqiOrN3/ODuuzDLJwIQS4zsah1WwfuEUqWHRg1I/uXVrdQ5dxHGR Pes++iy9fqn2cOsfACk91YFXhWUCIuR4QEFtVfxdTeQqXQx6Qz+D797xlz2005PHG6w2ij kvPk9cKeu12UfTQ4/ll4/9rQvka1fUzEnAe+sHwFDyPRffwOWPNRnWCktuShYQESgcALEy UUDtOkxjXvgSU7MQhKizKnHsIKfRwwOQr5Ot3BTGMrgp+SeFdgMeN6Ihv9j4LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644019279; a=rsa-sha256; cv=none; b=xJa/NJ9Jjz1LIrrqDx5RdU+OqQTFE35Hipav2eHr+mVr7CI/ikad5XNBEA8Nq6dNnXmkq+ 8qrldPIES2gw40nFaTwEsKPbhZAGlblGzOuoBTjPtszW99K8aka8p6FmXJgCnYmKxXUrWN J92p8o+MbfnhRpj0pL+iJQV2gSzS7e35YR1wjKPP4C/Po1Vzr12qg5I/iv1mYcycFD3f0c 7R/bM+gWBBq3MLOyv5mvg/RUpY5LlNzbsKDlR+/O7gBPGI87QgrQp1KMHM4W/wCsLQyZh4 Fm3+hJ7R4MlCMfMk+/2fq+77tgLoSqfsD6uFdFx2/uIULwtZPNpExr39f5QEyQ== 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=6bea696af25c606452515bc812c23b9f2614344a commit 6bea696af25c606452515bc812c23b9f2614344a Author: John Baldwin AuthorDate: 2022-02-04 23:57:57 +0000 Commit: John Baldwin CommitDate: 2022-02-04 23:57:57 +0000 linux_copyout_strings: Use PROC_PS_STRINGS(). Reviewed by: markj Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D34173 --- sys/amd64/linux32/linux32_sysvec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index 516d65f0f7bc..ff9ceda795cc 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -771,7 +771,7 @@ linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) char canary[LINUX_AT_RANDOM_LEN]; size_t execpath_len; - arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS; + arginfo = (struct linux32_ps_strings *)PROC_PS_STRINGS(imgp->proc); destp = (uintptr_t)arginfo; if (imgp->execpath != NULL && imgp->auxargs != NULL) {