From nobody Fri Jun 17 19:40:17 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 9B03D85CF8B; Fri, 17 Jun 2022 19:40:19 +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 4LPqBp5BKFz3h8b; Fri, 17 Jun 2022 19:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494819; 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=NSQdz5VoZBu1iUAO2DhP/nfYPu+lcyHGE+GUfbMWEzo=; b=yRQpMHcYWTYOY+QfoJ51XQJHI1fDhiKBq+XzaDSQtR2yhz7zkM9+EIOiHp+wzcMHBvMwpq DncSuUWDB0/8w63p/khiQVh+TRk+enXdNw7eQgJh06TgV/LwI2392Qg4QHltSvSA3uDNir Q0HD1quayDEDytDpd8DlRk6HEXudfIYpVEqP0cMmztTkAOGepjXz4leDGy3Lj1xKHT2sKY 2bzhHLTzTsxAcko44LzNrCxLMYoJcLfUj4d6sDdRvzEjfGxcWoyGHEcIxfofwG13Y88Ohl hAbdyRxen5KY/EgshuazIXq9p57iHxrA6tJoiXidiOF1mp8mLFzxZXTDjOjrcA== 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 015D4257E7; Fri, 17 Jun 2022 19:40:18 +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 25HJeHSs023654; Fri, 17 Jun 2022 19:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJeHdN023645; Fri, 17 Jun 2022 19:40:17 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:40:17 GMT Message-Id: <202206171940.25HJeHdN023645@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: 77158a5b2be8 - stable/13 - linux(4): Regen for prctl fix. 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: 77158a5b2be87e565fcd45757c8f30e066955987 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494819; 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=NSQdz5VoZBu1iUAO2DhP/nfYPu+lcyHGE+GUfbMWEzo=; b=kydq4r2HPzZDFKkVWJz0uiWBRwqHVXJA2BQZYETVDkVp2zqB376qPctMIRzXwUxnLv6JDx OkpTHDdndGIStfbA+X/ALYN0gVS9duXfJy8pVlYCikvgXZibvdQZKBpJ8dszEKwlIpqGPL tDhl9XAv4TpEQFwaOwwrcYvfRdCGWypyC19J4w7TRBFDmjtnzFB9pqVwvjEJUm4/y5vdnN r0zGdRtEZClhlOZfnU1MDGjiuaM+CXpgOmVw8MFu+R3Z5UP93XiibN6ZH1iJC881dG3Tfj nTJ0YEMNzR08+fWg8iMYUhnY2PuEX4sNcVMzYDggre1vSuM9Meo3mPNLU/S7/A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494819; a=rsa-sha256; cv=none; b=uQSI6tS4+30kJ3X4bLPBBX2nv1UFZQ3mrYaapKjfgN/VLGqsPsviEicT6B9qSALwE9B57C kfupPcmKAigJLWwU6G4K/MO85b2J4swkY2DrfIdn87QgFUWIR6zE1zVUBR9yMMqABgPY5+ nHbNgrgeuPnUDJaB2EuCPpqTxdXXpT4/qKlf2bCeU70nvNHxuwFbYybdkJ4Ol09XtNfYbw TTScSW5CGNJ3YDEzJWspy/rv2FaCbwHVgIQozzhuLFQX4LxQLTVH/4iIRRNb0Exy1PTL8g MJhIKfpiDp2+sHw3Lnm+Z3uFyOfMNnNLKqjvlSDpai56Ee0ldieaDHOHLoJUuQ== 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=77158a5b2be87e565fcd45757c8f30e066955987 commit 77158a5b2be87e565fcd45757c8f30e066955987 Author: Dmitry Chagin AuthorDate: 2022-06-17 19:35:11 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:35:11 +0000 linux(4): Regen for prctl fix. MFC after: 2 weeks (cherry picked from commit 7b76c79b0b3aa2b769e4c6b058243ec65278f361) --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index fbbdbce3a96f..a03ae004ff7d 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -537,7 +537,7 @@ 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_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 arg3_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg3; char arg3_r_[PADR_(l_uintptr_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)]; }; diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index f83703960a9d..8fc22b1910b3 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1161,7 +1161,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ iarg[1] = p->arg2; /* l_uintptr_t */ - iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[2] = p->arg3; /* l_uintptr_t */ iarg[3] = p->arg4; /* l_uintptr_t */ iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5033,7 +5033,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_uintptr_t"; break; case 2: - p = "l_ulntptr_t"; + p = "l_uintptr_t"; break; case 3: p = "l_uintptr_t"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index 49a8f11dfb54..f86a5a0bb136 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -538,7 +538,7 @@ 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_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 arg3_l_[PADL_(l_uintptr_t)]; l_uintptr_t arg3; char arg3_r_[PADR_(l_uintptr_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)]; }; diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 8e3070eeb648..419c067199c0 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1204,7 +1204,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[0] = p->option; /* l_int */ iarg[1] = p->arg2; /* l_uintptr_t */ - iarg[2] = p->arg3; /* l_ulntptr_t */ + iarg[2] = p->arg3; /* l_uintptr_t */ iarg[3] = p->arg4; /* l_uintptr_t */ iarg[4] = p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5133,7 +5133,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_uintptr_t"; break; case 2: - p = "l_ulntptr_t"; + p = "l_uintptr_t"; break; case 3: p = "l_uintptr_t";