From nobody Fri Dec 31 18:09:16 2021 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 1CF8519238B5; Fri, 31 Dec 2021 18:09:21 +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 4JQY7K5wB5z3hmn; Fri, 31 Dec 2021 18:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 1AD33103B7; Fri, 31 Dec 2021 18:09:17 +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 1BVI9GHd035106; Fri, 31 Dec 2021 18:09:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BVI9Gr0035105; Fri, 31 Dec 2021 18:09:16 GMT (envelope-from git) Date: Fri, 31 Dec 2021 18:09:16 GMT Message-Id: <202112311809.1BVI9Gr0035105@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: f04a09604938 - main - exec: Simplify sv_copyout_strings implementations a bit 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f04a096049382637178b54ffb45089f5f9fb3db9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640974157; 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=BiiktJWMls80TCh92QBvPgn/CU4o1I/o+WDeUFmOYtc=; b=G6ULYuRLOWUHQ/FdWIrEQY54c4SnwborVvp7OBDpAeao9ze/DN4v8AwTnv3EWOxh1H+C2w 36OyQyJZC3GeoQpCaT0SfB78iPPI1Jr8ii8Bsz6WqMLH+6LrMRpttDgcKRwOXf1evLE1+F UX9Im/p5CTPk622EdxEJKrSSkSIDw4KV9zoGv9oQ69D3YNCvgG8DcVUFMl1ITeO8GcD695 Qb/6kyBybqaVMCvwXnUKWPlUtcJGdwIr91xW3cHZy4dqw2NGmS2mN1ZEfVv+0VpnO+iHhG GiHCOFgLB1aY6odVH0vDa7uaFkqdV5GwiE+8O13GjII+JIDIu/YORz3ECd8DhQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640974157; a=rsa-sha256; cv=none; b=UEJ7avq4+CysM5Xyr38k3Q03InSxpk+YaqcSX/PwvtMNlDWi9PuGQ+0f/UXr4d6suatYy3 6A59CzhPCpoOguhQje9B+vxEX4ohksfBMbB1yYjGSP4NVcurUKyyhyAt5ee9cEFLZCh14t uDsp6D1Hi8wYN/TI2n+kRcdH4PRrTdWGhS8itrl/I04WZ9xgZgIiMpg0lFQw8jpYrGfwXd F2OaIjo73JkHtCaEAJ/GV9xIEPVRhHtuedZOOTgSXhi6ytpxxo87aPxmu6UCYZ407GK42D q+o11xBCtW2KK+FxEe9Dt8zgR0KOypK5rlyYOYVQW9danagY4ufZHzCXsr6QyQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f04a096049382637178b54ffb45089f5f9fb3db9 commit f04a096049382637178b54ffb45089f5f9fb3db9 Author: Mark Johnston AuthorDate: 2021-12-31 17:50:15 +0000 Commit: Mark Johnston CommitDate: 2021-12-31 17:50:15 +0000 exec: Simplify sv_copyout_strings implementations a bit Simplify control flow around handling of the execpath length and signal trampoline. Cache the sysentvec pointer in a local variable. No functional change intended. Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33703 --- sys/amd64/linux/linux_sysvec.c | 9 ++------ sys/amd64/linux32/linux32_sysvec.c | 9 ++------ sys/arm64/linux/linux_sysvec.c | 9 ++------ sys/compat/freebsd32/freebsd32_misc.c | 28 +++++++++--------------- sys/i386/linux/linux_sysvec.c | 8 ++----- sys/kern/kern_exec.c | 40 +++++++++++++---------------------- 6 files changed, 33 insertions(+), 70 deletions(-) diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index b7aedff23536..52757848cb98 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -358,17 +358,12 @@ linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) size_t execpath_len; struct proc *p; - /* Calculate string base and vector table pointers. */ - if (imgp->execpath != NULL && imgp->auxargs != NULL) - execpath_len = strlen(imgp->execpath) + 1; - else - execpath_len = 0; - p = imgp->proc; arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; destp = (uintptr_t)arginfo; - if (execpath_len != 0) { + if (imgp->execpath != NULL && imgp->auxargs != NULL) { + execpath_len = strlen(imgp->execpath) + 1; destp -= execpath_len; destp = rounddown2(destp, sizeof(void *)); imgp->execpathp = (void *)destp; diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index b9d2d7aaf7cd..9c8b04b2bf3a 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -771,16 +771,11 @@ linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) char canary[LINUX_AT_RANDOM_LEN]; size_t execpath_len; - /* Calculate string base and vector table pointers. */ - if (imgp->execpath != NULL && imgp->auxargs != NULL) - execpath_len = strlen(imgp->execpath) + 1; - else - execpath_len = 0; - arginfo = (struct linux32_ps_strings *)LINUX32_PS_STRINGS; destp = (uintptr_t)arginfo; - if (execpath_len != 0) { + if (imgp->execpath != NULL && imgp->auxargs != NULL) { + execpath_len = strlen(imgp->execpath) + 1; destp -= execpath_len; destp = rounddown2(destp, sizeof(uint32_t)); imgp->execpathp = (void *)destp; diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 3945f592f64e..a40fd981a43b 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -255,17 +255,12 @@ linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) struct proc *p; int argc, envc, error; - /* Calculate string base and vector table pointers. */ - if (imgp->execpath != NULL && imgp->auxargs != NULL) - execpath_len = strlen(imgp->execpath) + 1; - else - execpath_len = 0; - p = imgp->proc; arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; destp = (uintptr_t)arginfo; - if (execpath_len != 0) { + if (imgp->execpath != NULL && imgp->auxargs != NULL) { + execpath_len = strlen(imgp->execpath) + 1; destp -= execpath_len; destp = rounddown2(destp, sizeof(void *)); imgp->execpathp = (void *)destp; diff --git a/sys/compat/freebsd32/freebsd32_misc.c b/sys/compat/freebsd32/freebsd32_misc.c index cd9a6124734d..dd0ebcabef60 100644 --- a/sys/compat/freebsd32/freebsd32_misc.c +++ b/sys/compat/freebsd32/freebsd32_misc.c @@ -3391,6 +3391,7 @@ syscall32_helper_unregister(struct syscall_helper_data *sd) int freebsd32_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) { + struct sysentvec *sysent; int argc, envc, i; uint32_t *vectp; char *stringp; @@ -3401,30 +3402,20 @@ freebsd32_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) size_t execpath_len; int error, szsigcode; - /* - * Calculate string base and vector table pointers. - * Also deal with signal trampoline code for this exec type. - */ - if (imgp->execpath != NULL && imgp->auxargs != NULL) - execpath_len = strlen(imgp->execpath) + 1; - else - execpath_len = 0; - arginfo = (struct freebsd32_ps_strings *)curproc->p_sysent-> - sv_psstrings; + sysent = imgp->sysent; + + arginfo = (struct freebsd32_ps_strings *)sysent->sv_psstrings; imgp->ps_strings = arginfo; - if (imgp->proc->p_sysent->sv_sigcode_base == 0) - szsigcode = *(imgp->proc->p_sysent->sv_szsigcode); - else - szsigcode = 0; destp = (uintptr_t)arginfo; /* - * install sigcode + * Install sigcode. */ - if (szsigcode != 0) { + if (sysent->sv_sigcode_base == 0) { + szsigcode = *sysent->sv_szsigcode; destp -= szsigcode; destp = rounddown2(destp, sizeof(uint32_t)); - error = copyout(imgp->proc->p_sysent->sv_sigcode, (void *)destp, + error = copyout(sysent->sv_sigcode, (void *)destp, szsigcode); if (error != 0) return (error); @@ -3433,7 +3424,8 @@ freebsd32_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) /* * Copy the image path for the rtld. */ - if (execpath_len != 0) { + if (imgp->execpath != NULL && imgp->auxargs != NULL) { + execpath_len = strlen(imgp->execpath) + 1; destp -= execpath_len; imgp->execpathp = (void *)destp; error = copyout(imgp->execpath, imgp->execpathp, execpath_len); diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index d692679c3ec6..d5e1d320c20d 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -289,16 +289,12 @@ linux_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) size_t execpath_len; struct proc *p; - /* Calculate string base and vector table pointers. */ p = imgp->proc; - if (imgp->execpath != NULL && imgp->auxargs != NULL) - execpath_len = strlen(imgp->execpath) + 1; - else - execpath_len = 0; arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; destp = (uintptr_t)arginfo; - if (execpath_len != 0) { + if (imgp->execpath != NULL && imgp->auxargs != NULL) { + execpath_len = strlen(imgp->execpath) + 1; destp -= execpath_len; destp = rounddown2(destp, sizeof(void *)); imgp->execpathp = (void *)destp; diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index b9684833fa0e..7e7fbe31976a 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1616,37 +1616,26 @@ exec_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) uintptr_t destp, ustringp; struct ps_strings *arginfo; struct proc *p; + struct sysentvec *sysent; size_t execpath_len; - int error, szsigcode, szps; + int error, szsigcode; char canary[sizeof(long) * 8]; - szps = sizeof(pagesizes[0]) * MAXPAGESIZES; - /* - * Calculate string base and vector table pointers. - * Also deal with signal trampoline code for this exec type. - */ - if (imgp->execpath != NULL && imgp->auxargs != NULL) - execpath_len = strlen(imgp->execpath) + 1; - else - execpath_len = 0; p = imgp->proc; - szsigcode = 0; - arginfo = (struct ps_strings *)p->p_sysent->sv_psstrings; - imgp->ps_strings = arginfo; - if (p->p_sysent->sv_sigcode_base == 0) { - if (p->p_sysent->sv_szsigcode != NULL) - szsigcode = *(p->p_sysent->sv_szsigcode); - } + sysent = p->p_sysent; + + arginfo = (struct ps_strings *)sysent->sv_psstrings; destp = (uintptr_t)arginfo; + imgp->ps_strings = arginfo; /* - * install sigcode + * Install sigcode. */ - if (szsigcode != 0) { + if (sysent->sv_sigcode_base == 0 && sysent->sv_szsigcode != NULL) { + szsigcode = *(sysent->sv_szsigcode); destp -= szsigcode; destp = rounddown2(destp, sizeof(void *)); - error = copyout(p->p_sysent->sv_sigcode, (void *)destp, - szsigcode); + error = copyout(sysent->sv_sigcode, (void *)destp, szsigcode); if (error != 0) return (error); } @@ -1654,7 +1643,8 @@ exec_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) /* * Copy the image path for the rtld. */ - if (execpath_len != 0) { + if (imgp->execpath != NULL && imgp->auxargs != NULL) { + execpath_len = strlen(imgp->execpath) + 1; destp -= execpath_len; destp = rounddown2(destp, sizeof(void *)); imgp->execpathp = (void *)destp; @@ -1677,13 +1667,13 @@ exec_copyout_strings(struct image_params *imgp, uintptr_t *stack_base) /* * Prepare the pagesizes array. */ - destp -= szps; + imgp->pagesizeslen = sizeof(pagesizes[0]) * MAXPAGESIZES; + destp -= imgp->pagesizeslen; destp = rounddown2(destp, sizeof(void *)); imgp->pagesizes = (void *)destp; - error = copyout(pagesizes, imgp->pagesizes, szps); + error = copyout(pagesizes, imgp->pagesizes, imgp->pagesizeslen); if (error != 0) return (error); - imgp->pagesizeslen = szps; /* * Allocate room for the argument and environment strings.