From nobody Mon May 09 18:17:08 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 654281ADF5F3; Mon, 9 May 2022 18:17:09 +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 4KxqBs1X9wz3JN2; Mon, 9 May 2022 18:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652120229; 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=4XWwnVDU2OMTg9W8maMyBxpLH7w0CfPmUIaz7BVn9Do=; b=ETZjmdNy8cjGT7NKsNoctrVr5wr02FsxdLwEh2pI868ufA/m0xEsV6li+9qabzV/SYxRTH oCt0Y9vYDTlHfUMnW3OqnVqom3lFFFlgOocLbld60gKx3uq5jH4Qh34x+Ge+BvFVP6ozp9 /h5hFAUFmGEYpULzMQ9JjKx8YGbA110ZlsAG74Wtvr79cp0s5HW6UsnoUZPgO7RGtw4AEZ Gxjk9v5XnJTqvYC6qoZWwtAOdG24jj6oV9Fk73bh9XGp3oKwgtw3LK35wO8xFWolZVOTtr iBfUQ19nv7tBn1Aj4MCqUBesnKy4/6CfSNBZAi2+KMLI2eTzFy6CMMVmPUAFTg== 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 EEFF515E97; Mon, 9 May 2022 18:17:08 +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 249IH8Fr090496; Mon, 9 May 2022 18:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249IH8Je090495; Mon, 9 May 2022 18:17:08 GMT (envelope-from git) Date: Mon, 9 May 2022 18:17:08 GMT Message-Id: <202205091817.249IH8Je090495@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: e76857671873 - main - linux(4): Regen for prctl syscall. 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: e76857671873f0c9037dcc9c546b490714096c73 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652120229; 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=4XWwnVDU2OMTg9W8maMyBxpLH7w0CfPmUIaz7BVn9Do=; b=wop+MwCJK1MfVtRb815PhgWW9uCc7yrhJCsRxbX/gVGeVNvOznGTsF8uljIMpycALytHG2 JZlq+iyy77inGW/eLzUEZAWdYqRqK/fSMtPxgc8xm0+R5i+txliS/H8rKq/Kf3KKZ0Ajb6 8p6/HIYgi9P8AhjxAObRCJo8JZkjSzE/xLaBbR5rQ4+RII45RItU/odz6p5o693JnI0gUe 1hfGw8qEtX6S5BMPvJy9OavjnmP0NNo8yBEhneWhy0UvsBwn3A1oPOSS5v5o+hSV8tk2tR xXqbeXhm4V1HkOjgRTVsg4CXckgbTIPeqQ2AHwbg/z++pyozMJNBNonmNXRniA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652120229; a=rsa-sha256; cv=none; b=pLimt51fzmHnaiWRGsLpwfmw9gPtI+2M+JhPKt+jr+V9UWDe5qcn/oYLyDB5f4fJSr6+Cz OGGlGeFp72AOnhklBEgU8I4y1fzdqbnVhm39dQdejEPQ9Vb0/yt6X54q9312eNTdEwN/VY UoCaWwAUxyF/u+orxUTHwE122er+lzAi3PK7QbI0Cozfp6GsuKXaphqNJDvZeUXpK6p+A0 zgbCQ1Co1R27VqdNFomp8L44efG7ZPOmP0R2f/xjc2SDE+mgCJcR0TNTuW2XIpAO2A6bOA MbZQYE7LDNXbKjdY2Mv7cMCd4Y5dXUTVsMUAIIbZqyDRDdokqe7bRwEajBIxOA== 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=e76857671873f0c9037dcc9c546b490714096c73 commit e76857671873f0c9037dcc9c546b490714096c73 Author: Dmitry Chagin AuthorDate: 2022-05-09 18:10:48 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-09 18:10:48 +0000 linux(4): Regen for prctl syscall. MFC after: 2 weeks --- sys/amd64/linux32/linux32_proto.h | 8 ++++---- sys/amd64/linux32/linux32_systrace_args.c | 16 ++++++++-------- sys/i386/linux/linux_proto.h | 8 ++++---- sys/i386/linux/linux_systrace_args.c | 16 ++++++++-------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 70d40d5f5767..71b87077778f 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -536,10 +536,10 @@ struct linux_getresgid16_args { }; struct linux_prctl_args { char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; - char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; - char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; - char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; - char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg2; char arg2_r_[PADR_(l_uintptr_t)]; + char arg3_l_[PADL_(l_ulntptr_t)]; l_ulntptr_t arg3; char arg3_r_[PADR_(l_ulntptr_t)]; + char arg4_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg4; char arg4_r_[PADR_(l_uintptr_t)]; + char arg5_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg5; char arg5_r_[PADR_(l_uintptr_t)]; }; struct linux_rt_sigreturn_args { char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 0e0c4ca7f9f0..8a9f2aeed3d2 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1161,10 +1161,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ - iarg[a++] = p->arg2; /* l_int */ - iarg[a++] = p->arg3; /* l_int */ - iarg[a++] = p->arg4; /* l_int */ - iarg[a++] = p->arg5; /* l_int */ + uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ + iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ + uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5031,16 +5031,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: - p = "l_int"; + p = "l_uintptr_t"; break; case 2: - p = "l_int"; + p = "l_ulntptr_t"; break; case 3: - p = "l_int"; + p = "l_uintptr_t"; break; case 4: - p = "l_int"; + p = "l_uintptr_t"; break; default: break; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 10b0f2e4f49e..e0cbf9e4336a 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -537,10 +537,10 @@ struct linux_getresgid16_args { }; struct linux_prctl_args { char option_l_[PADL_(l_int)]; l_int option; char option_r_[PADR_(l_int)]; - char arg2_l_[PADL_(l_int)]; l_int arg2; char arg2_r_[PADR_(l_int)]; - char arg3_l_[PADL_(l_int)]; l_int arg3; char arg3_r_[PADR_(l_int)]; - char arg4_l_[PADL_(l_int)]; l_int arg4; char arg4_r_[PADR_(l_int)]; - char arg5_l_[PADL_(l_int)]; l_int arg5; char arg5_r_[PADR_(l_int)]; + char arg2_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg2; char arg2_r_[PADR_(l_uintptr_t)]; + char arg3_l_[PADL_(l_ulntptr_t)]; l_ulntptr_t arg3; char arg3_r_[PADR_(l_ulntptr_t)]; + char arg4_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg4; char arg4_r_[PADR_(l_uintptr_t)]; + char arg5_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg5; char arg5_r_[PADR_(l_uintptr_t)]; }; struct linux_rt_sigreturn_args { char ucp_l_[PADL_(struct l_ucontext *)]; struct l_ucontext * ucp; char ucp_r_[PADR_(struct l_ucontext *)]; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 1e4626dda202..717e6b5d80d2 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1204,10 +1204,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ - iarg[a++] = p->arg2; /* l_int */ - iarg[a++] = p->arg3; /* l_int */ - iarg[a++] = p->arg4; /* l_int */ - iarg[a++] = p->arg5; /* l_int */ + uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ + iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ + uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5131,16 +5131,16 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 1: - p = "l_int"; + p = "l_uintptr_t"; break; case 2: - p = "l_int"; + p = "l_ulntptr_t"; break; case 3: - p = "l_int"; + p = "l_uintptr_t"; break; case 4: - p = "l_int"; + p = "l_uintptr_t"; break; default: break;