From nobody Fri Jun 17 19:40:58 2022 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 9C60485D712; Fri, 17 Jun 2022 19:41: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 4LPqCc31dyz3hxR; Fri, 17 Jun 2022 19:41:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494861; 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=Zy+6kD2I5WaoUCxI2w+j+uhTaC4hnDhpBcE1/n4LmRI=; b=vNTBkJxVYJWV22+U7WKxtDGXKC4Ub9gOdI4cKmICDetG2sdtLr++g8UVkKXJwi82PFxUAt iELoeRpFl1S75TiL6Pn6VEeDmCnkYkSImY/lFdfmGm+Ffmxs1XKknltjfipIEc7MHdhfRP DpBE9b8B37gcUmcxHknj/OYACmDg0STZPKD1IETWF39950p/AhbF2cnWxgJKs1EcBu6yat +DZw5gjz4ghSL55uAndEq5cQRo9zIdQzrIOEY0mwBnytrtpi215rop9iWTIiXmTH1nO0vC OdR4K0fhU69RrLpOTBGi0Hv3LHmwxtyms7Qd0Xg8xba/winKAlJKjrHb+ebYmA== 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 84689257F2; Fri, 17 Jun 2022 19:40:58 +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 25HJew6i029856; Fri, 17 Jun 2022 19:40:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJewuL029855; Fri, 17 Jun 2022 19:40:58 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:58 GMT Message-Id: <202206171940.25HJewuL029855@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: 464d2fec8854 - stable/13 - linux(4): Fix execve() on amd64/linux32 after a125ed50 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 464d2fec8854b452cf4800c2dd0f1e4b94540a0e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494861; 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=Zy+6kD2I5WaoUCxI2w+j+uhTaC4hnDhpBcE1/n4LmRI=; b=BCgUd7TulJfmByzCCk86NTZcr+j0aJSWdGPiqG1yCT1DtZPc4DEGrDLiEf1EDntqgb3bwO mG44ngIAX4/dBz5R5aEriWQEm5c9VhzhCaJjhxnsAXkIY8YnlQ8A5RTGkRLbWWueaosKvk s9HByzJn20iZ5dX6KRuIC/cyF5UyQyBD2kVaPaHCGlHL0NIoBZNExbrpXxId24/eBu4dLy fXYHRrdfAB8e0gxjYjElvQEAFGDEoTXJ+Ta8sZqhl/+/RmKB0et0c/D1BC9acua7Im8a7+ +o4FOSspbAacgvG79IgTwKWSgjuFVrl4SZ93+gPgzQndgUlyGcgtXYXC9l2mhw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494861; a=rsa-sha256; cv=none; b=KawetKRT+Y1svHGLoinLWGHkKA35ZIIY1Rnsco/nBf0VXYfw9n8FOjcZ14I7gmOsEdiuE9 HoBPCeWWD1iSNRHz8kFxlA4JTaWH1Y1P0HX8wI6brP0Ia1eF1ZNei+OqL1bFVuou1rFjtQ nnuXgrEilo7T1rgL0gOVqvEkvousoDDNBsmwhvi4AF+SpE4/Bfn7VyI1nW7JftKk4v9yyi SfShVTVEhdVIQ4mkm8neCtmwj8rqb3pCxaF8n/PE2GzfHJVYjxuUmrU1uI6hgfqCeJcY3G R11VRaMhapFWxv9lxS93gQuWj17dGA6b7zANNb3CZSOZYUTwuSVaWNNF3G+60Q== 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=464d2fec8854b452cf4800c2dd0f1e4b94540a0e commit 464d2fec8854b452cf4800c2dd0f1e4b94540a0e Author: Dmitry Chagin AuthorDate: 2022-05-23 10:17:39 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:28 +0000 linux(4): Fix execve() on amd64/linux32 after a125ed50 MFC after: 2 weeks (cherry picked from commit 53726a1f1ed75a6788f5235833597e78781fffba) --- 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);