From nobody Fri Jun 17 19:38:38 2022 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 9936085B738; Fri, 17 Jun 2022 19:38:39 +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 4LPq8t6KkHz3QV2; Fri, 17 Jun 2022 19:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494719; 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=ytSVaURhin+pfNwUB1BMovZPs6s5TRJk8ttFZScw9BE=; b=H0RclmBVTqOrcGm51aglq6/dUS8301v5PQrOWCfLk4uxpcCYYresCPgVITWvoaE2oRQrlJ /D59EW8DxVAeUtoaWXuCOQWJ+o7d1W+5H/nhivccmbl6adFxueOprAHgdQGUvL1vf+Q6CY aSJRn1/UkbHklyvA2arnVvv+x0DXwQEDVUJAbezQpIOn76Uq7eObMXkiN9p9S+QJ915S4j xfQ9Aljx66N+zyPJZG1ZjG0V8tAwmhz4iQ75jIMXPW8Joo5V5V5OrsrebnV5jyOD2B0x0N GaIHVN53hJ0nbYdi+ZkHdsBfAgpxCi2x92vKFT1SDNZdbkyWvZ6WwZDol0EIhQ== 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 9709B25D84; Fri, 17 Jun 2022 19:38:38 +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 25HJccnR014953; Fri, 17 Jun 2022 19:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJccwO014952; Fri, 17 Jun 2022 19:38:38 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:38:38 GMT Message-Id: <202206171938.25HJccwO014952@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 6cc60a705ffa - stable/13 - linux_copyout_strings: Use PROC_PS_STRINGS(). 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6cc60a705ffa5ea88d311442c9ae8f40075400b8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494719; 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=ytSVaURhin+pfNwUB1BMovZPs6s5TRJk8ttFZScw9BE=; b=ZKhBVkfXuQBATLsqKe1ypiR1DZWriRPmSfQdCFRVdGxyBJ/OqwcJRJLx/Xt4CV1TmVx1Cp UXGoifmXTrlqYqfxC/+9/WEiy1A1rbUe/i9NjLJ9vTfSIfAXP9IPaM23tjUEOSFFwDHXSf RSrdrnV78vgNyBitrAaPqq693lLzVNXyUqf1viabOYn3jDDbOTYgYNq85QcntWGNWF0i6U h85afSmoVoGpPlL3lnWkb2hGKIIuBIIWgnAKOzrQZYa15nNR7yb2ewDDy42BppFAXOLley kLQ6xFmGHVZ5XrCj8xNPT0u+Rm4kfgvMtdFQJ4g7uF1maHg4xCKh4XUcKa2Qdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494719; a=rsa-sha256; cv=none; b=HgznBlBubn7qQ/UsOS4zSQCIHRRH97PB49UIgZX8s6/wiCQyC0OgKfvHWxZElhIs2NBxUB AjOU29yqo0HR7T6x+Kzg9orc8zaFK/72kw7drgAVEI6OaAv3iiodSbw2Yi9rjAY+VL3gQ8 oSrUNGOGZuG+gBvAZhKtTlU9LGXUgNjN1QRaG4/QJNBOA2Q+RASpWawm02ELtszlsfqNAA ByD1CwC+6vHfl+TbL12AojQg8c3UenUP5YXd3AG0Z7JjW52d3fp1xW/CHPMEyBoIBFbIJX Vp7RKzZMw6sQYQR5hQYJJQHaJfjYcDKfvTJL1UOfT2bDARl+1/MQWP1GfMR4+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6cc60a705ffa5ea88d311442c9ae8f40075400b8 commit 6cc60a705ffa5ea88d311442c9ae8f40075400b8 Author: John Baldwin AuthorDate: 2022-02-04 23:57:57 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:42 +0000 linux_copyout_strings: Use PROC_PS_STRINGS(). Reviewed by: markj Obtained from: CheriBSD Differential Revision: https://reviews.freebsd.org/D34173 (cherry picked from commit 6bea696af25c606452515bc812c23b9f2614344a) --- 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 7905b8587192..e84b61580b42 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -770,7 +770,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) {