From nobody Fri Jun 17 19:40:12 2022 X-Original-To: dev-commits-src-branches@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 4A2C685CBBD; Fri, 17 Jun 2022 19:40:14 +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 4LPqBj3TLJz3hBf; Fri, 17 Jun 2022 19:40:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494814; 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=hGGxxAgl678GXyb0H7fuy4NyCmQBT+1um34TWC+y03c=; b=VCLChL5EfQXWbnpbmRPbGMw4u0Z31iSKzRIlwHxsRKkv8neJKjw/0uZXKC6jOZPAZ2gRrK yMHFemQNzwG+yBNg+9PqiUreIK/MgJuIVhLPAapH2RvOoESgVSMoFYhtKt0AZHeUzpbJzF 86aQ6X8aX0+4r9GL8BMM+0CID4oc5KiVLbVHvIJxuwg2kSiKvBL+6Oo2p+1CZqCMJa5oEL JA5pG9lZomV+N82nq1RuZ7VR2BSyv5GhyUK0I4fCkplD2f+my3tL3U0Lf8tU3dUM/hVd3B hPejd34gOzDxrII3PEjiJplgVkTu4WckjrsjSIV+koowuuiZ29YDr+vDp8eVFA== 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 8AAAB25A4F; Fri, 17 Jun 2022 19:40:12 +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 25HJeCjk021099; Fri, 17 Jun 2022 19:40:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeCBW021095; Fri, 17 Jun 2022 19:40:12 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:12 GMT Message-Id: <202206171940.25HJeCBW021095@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: 9e7d26a0ca99 - stable/13 - linux(4): Regen for prctl syscall. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 9e7d26a0ca99b4d2032f8e9def89a592b3e11663 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494814; 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=hGGxxAgl678GXyb0H7fuy4NyCmQBT+1um34TWC+y03c=; b=wJaKRDi7iXukJcT8vGnHZ1Ov73Yg6gI25HZ4zyq90SZLbusHlSUEq99ix7YMpUwSOtB/PL EIZVA6tEzp7j6L7hPHQ8rPwE563ndmV4OBcQCiAPNgKdT3N1t2WsLsi2DrzlOXxCLP7Tac /+XXtdKxM3Lr7r45w8Y5BbzDgb/sGrBy25WRDSNOB5OD9dWpQ39tNX+2TOJil73Xo99ZD7 p/0ZS+1mp+7sUN4eXPnCcur9/XxZ+WhFYEr1Xjl19mZ6gzGurd/ThF3rrhwDfddduuklm2 z+2htibo1AJn4dsol9BFJH/rO1QP43/dsYSPOaB4ShcUP1zU6oT4jMqleNJvBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494814; a=rsa-sha256; cv=none; b=BvOChdWGG7G49hVjxSxQXTbafpNzvycHvwkv+zjqKarOH4yWyNubsQyJKVpRKS/JdHK6g4 bFYXCn5+cVbx5CrcO8rbGm7W2tYuTRcl3Xj1z08Uirj1wJ45YtQkhzZPzzI7+w5pYybYhu M7HdWHaD3LogdA09lEI2zB6Ub4H9R7oc/jTlX0YcxJaysNrHW2AFrWKr3+y8ZnfH+aXN/E k54ZxD/1BA6g8VFWGdjOoZ6NXLI7evEFuv1z3blx7AJ2O80+Hrl0vNeDPRoQ8RB4a7ZIA5 X7iXPpAGI6nvaQWP5BZFwiLn/ECPj2sMbnbNqjocjfe4dHf/fWO3kZ6tEMiKYQ== 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=9e7d26a0ca99b4d2032f8e9def89a592b3e11663 commit 9e7d26a0ca99b4d2032f8e9def89a592b3e11663 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:35:05 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:05 +0000 linux(4): Regen for prctl syscall. MFC after: 2 weeks (cherry picked from commit e76857671873f0c9037dcc9c546b490714096c73) --- 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 a631088b7d23..fbbdbce3a96f 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 a13b468ac296..f83703960a9d 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1160,10 +1160,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ - iarg[1] = p->arg2; /* l_int */ - iarg[2] = p->arg3; /* l_int */ - iarg[3] = p->arg4; /* l_int */ - iarg[4] = p->arg5; /* l_int */ + iarg[1] = p->arg2; /* l_uintptr_t */ + iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[3] = p->arg4; /* l_uintptr_t */ + iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5030,16 +5030,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 dbca5ec9a28b..49a8f11dfb54 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 ae655f26842d..8e3070eeb648 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1203,10 +1203,10 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) case 172: { struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ - iarg[1] = p->arg2; /* l_int */ - iarg[2] = p->arg3; /* l_int */ - iarg[3] = p->arg4; /* l_int */ - iarg[4] = p->arg5; /* l_int */ + iarg[1] = p->arg2; /* l_uintptr_t */ + iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[3] = p->arg4; /* l_uintptr_t */ + iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; break; } @@ -5130,16 +5130,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;