From nobody Mon May 23 10:20:14 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 3377A1B38F73; Mon, 23 May 2022 10:20:15 +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 4L6Cy66g6yz3FY7; Mon, 23 May 2022 10:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653301215; 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=RopFmA1SK0BtgZ2uDfrCR/Us/l7wMfwXy17PYWDdmfA=; b=w6fuFu3OqqDAGcfkb/eo8HCMZUty3LXq0BpjjCD6mMjg6iVLNgiixI1q9+rSWxBveyGgnK RzZ4q+grexSWOE3y0ngT0NDlyKChuaajEbgyxV/Ysm5qm0fNpkGdRcsw6d7H64n+lCmZ8+ mHsuQDa1ZB4TYp+ngbULRSSdCpk65YSfcNqU8C0tRnqm2I6uZh5f+j/q81NCRAQcAIupdY VyF+lHU94LVD2U833gpsuIusnUgwmHYbfZSzgWNas4ct54QK+hIMOvAGqgOUOjiPxH9g5L WpDodUjFpeOVyCVSNJ4DVCna+0rVfXBcRLZD5FqWsuCTrW4Dq4Iq1b5HrjHGUQ== 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 BACC95FE3; Mon, 23 May 2022 10:20:14 +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 24NAKERV029084; Mon, 23 May 2022 10:20:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NAKEM6029079; Mon, 23 May 2022 10:20:14 GMT (envelope-from git) Date: Mon, 23 May 2022 10:20:14 GMT Message-Id: <202205231020.24NAKEM6029079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 53726a1f1ed7 - main - linux(4): Fix execve() on amd64/linux32 after a125ed50 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/main X-Git-Reftype: branch X-Git-Commit: 53726a1f1ed75a6788f5235833597e78781fffba Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653301215; 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=RopFmA1SK0BtgZ2uDfrCR/Us/l7wMfwXy17PYWDdmfA=; b=mnNDnHwPxOM49n1s3UourY9yxhOouYPNLObgeQUagPd0CqSFNabc2EBtqzGGh/aNrGTHD8 oBXbQu6zHBtF5gKr5GtspGSdAiNWm9tevP1USgQUlD9ebYzXEd6RTLho6z/W9yVesBFa6t isokGjQxE93L0NdrwYe5lLroMAoJItYzX906N07jpuX4gyGONN2+tEAfslwX3ZvZmo4fnh C+2rSn1xY89DD7KkxZCwEh4XtFPekJmNSCMuUNtHDLooqHa3FqEdnokCB3eE83cic4akG1 yOW4V/XmI/JTtMfqD92+qw9GAbItNkpsmLJcXOGKpHdPLaNjz/QIkW+53CUdQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653301215; a=rsa-sha256; cv=none; b=kSyu5BBHuLe3e+eoct/7Tmn/CP7O4bsqp2/oBeN5+MQdWxkGJLzaMjLmjy2mP816+L02nb 5dfm1Zyq2RITKLQv0/+sRRMHaMeNawefXLVlKb8ZuqnvEhazjpJv77UTX77NoVvgv+RNmi k7cv1uVTO+mCD9bwzy1/Rka6yRpyXbinVDAmz3J4K4GuHKLYE8Km+bmUxYq2OpYy6Ld54F Sirh3qAFVEfJcWVLRj044ZzAeBvS3f9Onbj0p2RTmj144aJXgNkaLpwsNTxAqMc1oZmYRf xgIwEy/2/x9Qp3QKOYvnMD51uVoelwXcJUrQaQfa1n0NcdKElHQd8Fc6BEpOyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=53726a1f1ed75a6788f5235833597e78781fffba commit 53726a1f1ed75a6788f5235833597e78781fffba Author: Dmitry Chagin AuthorDate: 2022-05-23 10:17:39 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-23 10:17:39 +0000 linux(4): Fix execve() on amd64/linux32 after a125ed50 MFC after: 2 weeks --- sys/amd64/linux32/linux32_machdep.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index e1d7742d0a21..9746c4bd7cdf 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -134,11 +134,15 @@ linux_execve(struct thread *td, struct linux_execve_args *args) char *path; int error; - LCONVPATHEXIST(args->path, &path); - - error = freebsd32_exec_copyin_args(&eargs, path, UIO_SYSSPACE, - args->argp, args->envp); - free(path, M_TEMP); + if (!LUSECONVPATH(td)) { + error = freebsd32_exec_copyin_args(&eargs, args->path, UIO_USERSPACE, + args->argp, args->envp); + } else { + LCONVPATHEXIST(args->path, &path); + error = freebsd32_exec_copyin_args(&eargs, path, UIO_SYSSPACE, + args->argp, args->envp); + LFREEPATH(path); + } if (error == 0) error = linux_common_execve(td, &eargs); AUDIT_SYSCALL_EXIT(error == EJUSTRETURN ? 0 : error, td);