From nobody Mon May 29 09:18:45 2023 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 4QV91y0CJxz4XSbH; Mon, 29 May 2023 09:18:46 +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 4QV91x6sxWz4Jq6; Mon, 29 May 2023 09:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685351926; 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=NBQN5XRKSmvOCW1EuJsmLeMIrKPuG6daBE4lujCKJH8=; b=sjuf6ec2ysaviLMMOyR5UQf494qwxdAeQ50Chzq6dG+szTzxrjT/HUbMCFDtE+pS3GfNIt rlOMGPZmk1UzWyi56gomWJxT5OMYwhgk1eSRVoFjVQifrEbx8vqZKZT+bzAAiwiyLHb2Dr l1tTf/SCmaK1MyV6Bv7+yhwHcQ0QPO8GXzorExW+f18G1umieap9Go+NNtGoX+0zqTuTG9 pjVmotHWVGPMqHrBrs1rPtKPcQkurYkQ2XX+HNW2fzs990ie4LG1E258UuKVC6OyOdtL5l glci86OkkG37fiEpyD/CHWv1jP5/I6FmxmfF8YYYz8dTUayDXymX+aU0G0j8cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685351926; 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=NBQN5XRKSmvOCW1EuJsmLeMIrKPuG6daBE4lujCKJH8=; b=Z86wmDaUNpcBt0Ei4P1veCLqV6SsV5OXok8ZcaujI0eONoSl3Xw4zCR1wsW0PZcsxhxJj1 NRsPCBrJFfRHrxPnUTQOEiqMz1ecR00C2Nhp7uiLXEUMxK+/d6/216LMs6iV4gQcJ99Xe7 N43S0d/7CKrpKc2JeMVz6IVAFvPJvV1+y969okyNp4ua85UNCvIys8n5boqcS+w7VWQqpb ++PhYw/lkZiml9jJTX7++1KuQL6nMtH3WLXQgHVTh6/U9F3RUoW7mvxP3d5C5rUHkO5uOg Zr/Y2LUghj0BQvq4z8Cb90UblXyjVur1w35/vPSHixAg4WHzXxBkA7Mcyi5kEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685351926; a=rsa-sha256; cv=none; b=WqMZZgQvcKQ8t5EzhFMSMcS+ZOaZXN8TGq0vICzlY7UAhKNc38w+5YxOlmZJsa53ZIKphA f7M3IqNpWPt7w5lUFRjI6Fl6YKZgSnvzmH9VFDKOuiOuP2Lm+ahHl1iIryUn7HM5qfb0po OJC7O+udIkmUOjV2yOhS3S4OxcAPdXMDdHokQqKA1xiPwtOUjVANJJaGF74AbMI67HR6fX kLXcX9KhQK1136m4VK3xvg2KVhdT1yNKamWNsHRHwNvjERTRNgRwlPi1GG/Fzx/G53Fdjp gbRG0FSAq0BSSCyyOV8JI1/SwMuq6ZJUI6KRa+zl/OO0EJGKIseu90UnHpaoFg== 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 4QV91x5crmz15cx; Mon, 29 May 2023 09:18:45 +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 34T9IjTm063391; Mon, 29 May 2023 09:18:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34T9Ijre063390; Mon, 29 May 2023 09:18:45 GMT (envelope-from git) Date: Mon, 29 May 2023 09:18:45 GMT Message-Id: <202305290918.34T9Ijre063390@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: eb98f7791040 - main - linux(4): Regen for linux_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: eb98f7791040dbb072912c19d5ae3b629e3628d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=eb98f7791040dbb072912c19d5ae3b629e3628d4 commit eb98f7791040dbb072912c19d5ae3b629e3628d4 Author: Dmitry Chagin AuthorDate: 2023-05-29 09:18:30 +0000 Commit: Dmitry Chagin CommitDate: 2023-05-29 09:18:30 +0000 linux(4): Regen for linux_execve MFC after: 2 month --- sys/amd64/linux/linux_proto.h | 4 ++-- sys/amd64/linux/linux_systrace_args.c | 8 ++++---- sys/amd64/linux32/linux32_proto.h | 4 ++-- sys/amd64/linux32/linux32_systrace_args.c | 8 ++++---- sys/arm64/linux/linux_proto.h | 4 ++-- sys/arm64/linux/linux_systrace_args.c | 8 ++++---- sys/i386/linux/linux_proto.h | 4 ++-- sys/i386/linux/linux_systrace_args.c | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h index 5fa8ec72f109..faedfd08b6c8 100644 --- a/sys/amd64/linux/linux_proto.h +++ b/sys/amd64/linux/linux_proto.h @@ -288,8 +288,8 @@ struct linux_vfork_args { }; struct linux_execve_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)]; - char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; + char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)]; + char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)]; }; struct linux_exit_args { char rval_l_[PADL_(l_int)]; l_int rval; char rval_r_[PADR_(l_int)]; diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c index a4e1af26ca3d..f9d5f3c2af9e 100644 --- a/sys/amd64/linux/linux_systrace_args.c +++ b/sys/amd64/linux/linux_systrace_args.c @@ -531,8 +531,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 59: { struct linux_execve_args *p = params; uarg[a++] = (intptr_t)p->path; /* char * */ - uarg[a++] = (intptr_t)p->argp; /* char ** */ - uarg[a++] = (intptr_t)p->envp; /* char ** */ + uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */ + uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */ *n_args = 3; break; } @@ -3651,10 +3651,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland char *"; break; case 1: - p = "userland char **"; + p = "userland l_uintptr_t *"; break; case 2: - p = "userland char **"; + p = "userland l_uintptr_t *"; break; default: break; diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 0f37367ce8dc..2ea6c867f49f 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -64,8 +64,8 @@ struct linux_unlink_args { }; struct linux_execve_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char argp_l_[PADL_(uint32_t *)]; uint32_t * argp; char argp_r_[PADR_(uint32_t *)]; - char envp_l_[PADL_(uint32_t *)]; uint32_t * envp; char envp_r_[PADR_(uint32_t *)]; + char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)]; + char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)]; }; struct linux_chdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 71c78673a921..cfddcc38af8e 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -95,8 +95,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 11: { struct linux_execve_args *p = params; uarg[a++] = (intptr_t)p->path; /* char * */ - uarg[a++] = (intptr_t)p->argp; /* uint32_t * */ - uarg[a++] = (intptr_t)p->envp; /* uint32_t * */ + uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */ + uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */ *n_args = 3; break; } @@ -3400,10 +3400,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland char *"; break; case 1: - p = "userland uint32_t *"; + p = "userland l_uintptr_t *"; break; case 2: - p = "userland uint32_t *"; + p = "userland l_uintptr_t *"; break; default: break; diff --git a/sys/arm64/linux/linux_proto.h b/sys/arm64/linux/linux_proto.h index e677b9f13839..951ef93c6f99 100644 --- a/sys/arm64/linux/linux_proto.h +++ b/sys/arm64/linux/linux_proto.h @@ -866,8 +866,8 @@ struct linux_clone_args { }; struct linux_execve_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)]; - char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; + char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)]; + char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)]; }; struct linux_mmap2_args { char addr_l_[PADL_(l_ulong)]; l_ulong addr; char addr_r_[PADR_(l_ulong)]; diff --git a/sys/arm64/linux/linux_systrace_args.c b/sys/arm64/linux/linux_systrace_args.c index 8e256e2b718a..ecc3241df319 100644 --- a/sys/arm64/linux/linux_systrace_args.c +++ b/sys/arm64/linux/linux_systrace_args.c @@ -1763,8 +1763,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 221: { struct linux_execve_args *p = params; uarg[a++] = (intptr_t)p->path; /* char * */ - uarg[a++] = (intptr_t)p->argp; /* char ** */ - uarg[a++] = (intptr_t)p->envp; /* char ** */ + uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */ + uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */ *n_args = 3; break; } @@ -5285,10 +5285,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland char *"; break; case 1: - p = "userland char **"; + p = "userland l_uintptr_t *"; break; case 2: - p = "userland char **"; + p = "userland l_uintptr_t *"; break; default: break; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 8014d7dbdcba..9541e5a9f058 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -64,8 +64,8 @@ struct linux_unlink_args { }; struct linux_execve_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; - char argp_l_[PADL_(char **)]; char ** argp; char argp_r_[PADR_(char **)]; - char envp_l_[PADL_(char **)]; char ** envp; char envp_r_[PADR_(char **)]; + char argp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * argp; char argp_r_[PADR_(l_uintptr_t *)]; + char envp_l_[PADL_(l_uintptr_t *)]; l_uintptr_t * envp; char envp_r_[PADR_(l_uintptr_t *)]; }; struct linux_chdir_args { char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 1e5227bb20d5..ccee9b8ef94f 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -95,8 +95,8 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 11: { struct linux_execve_args *p = params; uarg[a++] = (intptr_t)p->path; /* char * */ - uarg[a++] = (intptr_t)p->argp; /* char ** */ - uarg[a++] = (intptr_t)p->envp; /* char ** */ + uarg[a++] = (intptr_t)p->argp; /* l_uintptr_t * */ + uarg[a++] = (intptr_t)p->envp; /* l_uintptr_t * */ *n_args = 3; break; } @@ -3431,10 +3431,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "userland char *"; break; case 1: - p = "userland char **"; + p = "userland l_uintptr_t *"; break; case 2: - p = "userland char **"; + p = "userland l_uintptr_t *"; break; default: break;