From nobody Mon May 23 10:20:16 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 4F24C1B392E6; Mon, 23 May 2022 10:20:17 +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 4L6Cy90L9fz3FhG; Mon, 23 May 2022 10:20:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653301217; 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=asldyBCCz29UhuJ8tLkBIFonnzJNH3xTR14Dw0ybTe4=; b=MSYCikYmmMe4KMLt6CYoSi71oI2hMhB/k9nue2ZxzYFiWcxPEJ1CtDL1WqYCnJ5ikbwa3k jQeaDWj3Qw6fk8ENBfqhcLdFAMofm0VkUlLcd9fNLThI0nEX1b/OBYtNG6tuXasJaFjoBA 5QSNxZP7XaQyuXOQqYNbhNt2GNeH9PvcRrKJxbES6w4tQald0IVFdWoOU0lXpexKr+omaE F6tSGJU/DS+uq941BU30Cc2bWJHatkI7j0A3MiYlFi2UfHn9Yp8nryl/tGlBf9M06MdcHr 7m6J7hyh56nLhm+diw2lWCw5ctpWub26eK92goNLNoXmO2j+QCkx2nIpUY/3nw== 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 D243B5FE5; Mon, 23 May 2022 10:20:16 +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 24NAKGu1030084; Mon, 23 May 2022 10:20:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24NAKGC2030081; Mon, 23 May 2022 10:20:16 GMT (envelope-from git) Date: Mon, 23 May 2022 10:20:16 GMT Message-Id: <202205231020.24NAKGC2030081@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: 26700ac0c4d0 - main - linux(4): Deduplicate execve 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26700ac0c4d0466c00f944bde9613d18625d1f91 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653301217; 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=asldyBCCz29UhuJ8tLkBIFonnzJNH3xTR14Dw0ybTe4=; b=EBh9sRhncmz9lQP5NMA59EVJePAicGccyQU9tNELXk7oYQoqSwWpIR8+mhwyWYQ3AKE1CL g+uSRnb1oHZVhVa9mmIiwz0xTYn5980a+yyG9taUlUKyBAehsr//hmcJIZgU9Qfee9u/DL tYmaf97xHGodhhxdPb565I/cJeKLo2S37u/YjA12aYjEVXd/dYqTNOELzyIi2/o4oXvBkF I+8fwMypg/P0IXzvz1JEoNK99TFgigcvzTc0LbWXo2zzwGU24peSDcVc8UyIGR4DK2dv+S +c0BmzNbLpMHRqZ2Vci28Fc1pF1zToT9FYY03SfWq7q0dFesCVZoVuwQN7lTKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653301217; a=rsa-sha256; cv=none; b=o8EgICGssM0D3dwKfxinGjVeThm14SUnTp7we8II+FbwXicRMGjRDuM8YKMjLZPMGtTMkr t+qbw6rc3cd32WI/tC1VG3+pOIYPs9PW6yhSOuqgPnBS8qiRlGbKKpT2qaxY+hKoX7CvN0 cz2X7ah57D99s971eGrkLNr2H6Tl6Kml3HOpqS2eVF+ZuEUPhtx9JxZp0KBeNKkQVxuhH4 mKZ0aGmNHptVm2vj8J6Ge2pAEBJ4eVluQW613A2Cw8aGgur2Dj6NFAe+IW3RuQjrVlIedd /J3wVk8Ahfe9c90NPG59jg3t9f27Vdl5xxOx6/V6Xd06OAeWS5Wb/6ngCcsWRw== 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=26700ac0c4d0466c00f944bde9613d18625d1f91 commit 26700ac0c4d0466c00f944bde9613d18625d1f91 Author: Dmitry Chagin AuthorDate: 2022-05-23 10:18:41 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-23 10:18:41 +0000 linux(4): Deduplicate execve As linux_execve is common across archs, except amd64 32-bit Linuxulator, move it under compat/linux. Noted by: andrew@ MFC after: 2 weeks --- sys/amd64/linux/linux_machdep.c | 27 --------------------------- sys/arm64/linux/linux_machdep.c | 30 ------------------------------ sys/compat/linux/linux_misc.c | 28 ++++++++++++++++++++++++++++ sys/i386/linux/linux_machdep.c | 25 ------------------------- 4 files changed, 28 insertions(+), 82 deletions(-) diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 18be62dab9ae..1c042424f3ea 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -83,8 +82,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include @@ -98,30 +95,6 @@ __FBSDID("$FreeBSD$"); #define LINUX_ARCH_AMD64 0xc000003e -int -linux_execve(struct thread *td, struct linux_execve_args *args) -{ - struct image_args eargs; - char *path; - int error; - - LINUX_CTR(execve); - - if (!LUSECONVPATH(td)) { - error = exec_copyin_args(&eargs, args->path, UIO_USERSPACE, - args->argp, args->envp); - } else { - LCONVPATHEXIST(args->path, &path); - error = 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); - return (error); -} - int linux_set_upcall(struct thread *td, register_t stack) { diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index 749e097730f7..0bfe51f7da1e 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -33,19 +33,15 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include #include -#include - #include #include #include -#include #include #include #include @@ -59,32 +55,6 @@ LIN_SDT_PROVIDER_DECLARE(LINUX_DTRACE); /* DTrace probes */ LIN_SDT_PROBE_DEFINE0(machdep, linux_mmap2, todo); -/* - * LINUXTODO: deduplicate; linux_execve is common across archs, except that on - * amd64 compat linuxulator it calls freebsd32_exec_copyin_args. - */ -int -linux_execve(struct thread *td, struct linux_execve_args *uap) -{ - struct image_args eargs; - char *path; - int error; - - if (!LUSECONVPATH(td)) { - error = exec_copyin_args(&eargs, uap->path, UIO_USERSPACE, - uap->argp, uap->envp); - } else { - LCONVPATHEXIST(uap->path, &path); - error = exec_copyin_args(&eargs, path, UIO_SYSSPACE, - uap->argp, uap->envp); - LFREEPATH(path); - } - if (error == 0) - error = linux_common_execve(td, &eargs); - AUDIT_SYSCALL_EXIT(error == EJUSTRETURN ? 0 : error, td); - return (error); -} - int linux_set_upcall(struct thread *td, register_t stack) { diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 7ea4b8481220..225187826677 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -41,6 +41,7 @@ __FBSDID("$FreeBSD$"); #include #endif #include +#include #include #include #include @@ -74,6 +75,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -2906,3 +2908,29 @@ linux_seccomp(struct thread *td, struct linux_seccomp_args *args) return (EINVAL); } } + +#ifndef COMPAT_LINUX32 +int +linux_execve(struct thread *td, struct linux_execve_args *args) +{ + struct image_args eargs; + char *path; + int error; + + LINUX_CTR(execve); + + if (!LUSECONVPATH(td)) { + error = exec_copyin_args(&eargs, args->path, UIO_USERSPACE, + args->argp, args->envp); + } else { + LCONVPATHEXIST(args->path, &path); + error = 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); + return (error); +} +#endif diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 1e665eb9f505..dc156dbd673d 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include #include @@ -61,8 +60,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include - #include #include #include @@ -97,28 +94,6 @@ struct l_old_select_argv { struct l_timeval *timeout; }; -int -linux_execve(struct thread *td, struct linux_execve_args *args) -{ - struct image_args eargs; - char *newpath; - int error; - - if (!LUSECONVPATH(td)) { - error = exec_copyin_args(&eargs, args->path, UIO_USERSPACE, - args->argp, args->envp); - } else { - LCONVPATHEXIST(args->path, &newpath); - error = exec_copyin_args(&eargs, newpath, UIO_SYSSPACE, - args->argp, args->envp); - LFREEPATH(newpath); - } - if (error == 0) - error = linux_common_execve(td, &eargs); - AUDIT_SYSCALL_EXIT(error == EJUSTRETURN ? 0 : error, td); - return (error); -} - struct l_ipc_kludge { struct l_msgbuf *msgp; l_long msgtyp;