From nobody Fri Jun 17 19:37:58 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 1687885AF85; Fri, 17 Jun 2022 19:38:00 +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 4LPq873c63z3Pxy; Fri, 17 Jun 2022 19:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494679; 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=EOnu3DltzGItDyEGZc2RPXOUnAjrx2f0x7WZ1bXfy5w=; b=E4vPCMGIefqype5M7Q6Iv9YN3UmIEgRNzVyW7iWiRfTWbebFtiNiSdeloo3u3E6kJGIw6n ANELp+36BqYQVCGau8B0X5vaIFCKFQJS+DAY7xj7HWCYiIubmM1ltv3wUCudOU8IBIhSx0 itpibuBpThHQKztXQSQRH2HkgzUHkBQbMhMD3GKjh4Umv4bjmGU7H4WO32ovkCDbv3FtmQ G+4tidXzFaXqr3b45oMU30VznHpInlBvv3mwVVtDxn6xLeMwZCiMMbC0+Lyww1/ID40gd6 419nwd9bSpSV3hr9tBK6qVSiBtZ6bn4MTOFUAIU3YNv2pULASsfwYouuO4M1+A== 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 CD9B225D03; Fri, 17 Jun 2022 19:37: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 25HJbwSs014068; Fri, 17 Jun 2022 19:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJbwb7014067; Fri, 17 Jun 2022 19:37:58 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:37:58 GMT Message-Id: <202206171937.25HJbwb7014067@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: b2c247a0dba4 - stable/13 - linux(4): Change clone syscall definition to match Linux actual one. 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: b2c247a0dba4370943322f89334bda9e3835a0d1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494679; 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=EOnu3DltzGItDyEGZc2RPXOUnAjrx2f0x7WZ1bXfy5w=; b=r+i+Ll8gXE7QFLFOyuTDp+nHZZF6Wj1NnMretr4Csprq58GmglG3J6C8zXYnTUBfDtgoHv /rJxSaIy3eVWEdX9ELDRfyGmGlnH9uwWQLQf2K6RAd2Idbg71iR5iockh3ayQKaWdWl2g/ WyOP7xjZYmebsCKazUeIcvJdKXY3Kmm46C0xAlJJ1duMbCb7EtWbEWuct/6Mn+LJBlOjn4 Re1N++uC9SymMNHeLf2dNlQ6wqpJjv71Ed8mkMreN7N8jYe/jaN6JDJPjT7K26J4A52UkP fl9y+VWMf36drjwbinuJGd9UzB/dJWsEjd1lu3tZSIAw5ek3HsE+3YYq+eo4hw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494679; a=rsa-sha256; cv=none; b=n6fZJCAJNe6knGkFaY0he+rhdMi7HPEtXIrrXB9z0WQLzoA105iWDQs6Ch13zvM6vyKoV1 9pu/d462dRMecK60C8cgAwPdc+XLuXTD8OBga5LQ17gVD9s/sUtLtAKXT7TyzX92LU6oiN wShJ8YELYC6eS+SOP2c1BMZoO4tgWmyWoiHGg33RWcrxpazAhPy4a5RRgZuCczP6q/pPZv PkZOtWbpNAhgAhAtnEZJQRlQ7gnIj/j66yEN/3dkHk3RkdBIXkCFcvj+jeYxzdNfZQeYX1 1VxrIXKnUAC7ojtGMG0lGFxcn+1wHnUVQ/Jt8bOdSSEO+8Va9q2jZdlHoF1Xog== 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=b2c247a0dba4370943322f89334bda9e3835a0d1 commit b2c247a0dba4370943322f89334bda9e3835a0d1 Author: Dmitry Chagin AuthorDate: 2021-08-12 08:46:36 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:29 +0000 linux(4): Change clone syscall definition to match Linux actual one. Differential revision: https://reviews.freebsd.org/D31473 MFC after: 2 weeks (cherry picked from commit f1c450492f81cda4bddd46dc71ea4c92907567ac) --- sys/amd64/linux/syscalls.master | 8 ++++---- sys/amd64/linux32/syscalls.master | 10 +++++----- sys/arm/linux/syscalls.master | 10 +++++----- sys/arm64/linux/syscalls.master | 8 ++++---- sys/compat/linux/linux_fork.c | 10 +++++----- sys/i386/linux/syscalls.master | 10 +++++----- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index b9b88a036e61..cdf663ce2e06 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -422,10 +422,10 @@ 56 AUE_RFORK STD { int linux_clone( l_ulong flags, - void *stack, - void *parent_tidptr, - void *child_tidptr, - void *tls + l_ulong stack, + l_int *parent_tidptr, + l_int *child_tidptr, + l_ulong tls ); } 57 AUE_FORK STD { diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index 60f227142f01..ff7ab7f98ca8 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -642,11 +642,11 @@ } 120 AUE_RFORK STD { int linux_clone( - l_int flags, - void *stack, - void *parent_tidptr, - void *tls, - void *child_tidptr + l_ulong flags, + l_ulong stack, + l_int *parent_tidptr, + l_ulong tls, + l_int *child_tidptr ); } 121 AUE_SYSCTL STD { diff --git a/sys/arm/linux/syscalls.master b/sys/arm/linux/syscalls.master index 46cf988c3dfe..3221aaa6bd6d 100644 --- a/sys/arm/linux/syscalls.master +++ b/sys/arm/linux/syscalls.master @@ -508,11 +508,11 @@ } 120 AUE_RFORK STD { int linux_clone( - l_int flags, - void *stack, - void *parent_tidptr, - void *tls, - void * child_tidptr + l_ulong flags, + l_ulong stack, + l_int *parent_tidptr, + l_ulong tls, + l_int *child_tidptr ); } 121 AUE_SYSCTL STD { diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index 7b4ebbb2c2e9..6e163cc3360d 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -1316,10 +1316,10 @@ 220 AUE_RFORK STD { int linux_clone( l_ulong flags, - void *stack, - void *parent_tidptr, - void *tls, - void *child_tidptr + l_ulong stack, + l_int *parent_tidptr, + l_ulong tls, + l_int *child_tidptr ); } 221 AUE_EXECVE STD { diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index bc7704795127..955e9e512bd1 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -205,10 +205,10 @@ linux_clone_proc(struct thread *td, struct linux_clone_args *args) * stack. This is what normal fork() does, so we just keep tf_rsp arg * intact. */ - linux_set_upcall(td2, PTROUT(args->stack)); + linux_set_upcall(td2, args->stack); if (args->flags & LINUX_CLONE_SETTLS) - linux_set_cloned_tls(td2, args->tls); + linux_set_cloned_tls(td2, PTRIN(args->tls)); /* * If CLONE_PARENT is set, then the parent of the new process will be @@ -253,7 +253,7 @@ linux_clone_thread(struct thread *td, struct linux_clone_args *args) return (EINVAL); /* Threads should be created with own stack */ - if (args->stack == NULL) + if (PTRIN(args->stack) == NULL) return (EINVAL); p = td->td_proc; @@ -290,7 +290,7 @@ linux_clone_thread(struct thread *td, struct linux_clone_args *args) KASSERT(em != NULL, ("clone_thread: emuldata not found.\n")); if (args->flags & LINUX_CLONE_SETTLS) - linux_set_cloned_tls(newtd, args->tls); + linux_set_cloned_tls(newtd, PTRIN(args->tls)); if (args->flags & LINUX_CLONE_CHILD_SETTID) em->child_set_tid = args->child_tidptr; @@ -304,7 +304,7 @@ linux_clone_thread(struct thread *td, struct linux_clone_args *args) cpu_thread_clean(newtd); - linux_set_upcall(newtd, PTROUT(args->stack)); + linux_set_upcall(newtd, args->stack); PROC_LOCK(p); p->p_flag |= P_HADTHREADS; diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 3a70c1352b44..aecb852e21c7 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -659,11 +659,11 @@ } 120 AUE_RFORK STD { int linux_clone( - l_int flags, - void *stack, - void *parent_tidptr, - void *tls, - void *child_tidptr + l_ulong flags, + l_ulong stack, + l_int *parent_tidptr, + l_ulong tls, + l_int *child_tidptr ); } 121 AUE_SYSCTL STD {