From nobody Mon May 09 18:48:24 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 255AA1AE79C4; Mon, 9 May 2022 18:48:25 +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 4Kxqtx0R8Dz3hV0; Mon, 9 May 2022 18:48:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652122105; 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=gweOySb4tKPm6L22ksytNb2pKrIpKj0liiCP84fCD7U=; b=qytJ80HiIoJoLEyTJe4etqv6ay4f3zSNHuiYvV+NGq5dbQZGXlzWba2OGXl3vJTRRZj7nr UF0oxwCcJn0+woTfoS+7Tm+Vx73KvlqCg9aippLkPMYek2EsS1OnhCjOi/3j7Qrl2O7eLh OQZyNHXAyn5WjwhOyFPXN89Z4ZZugT9TR38+1MxBPHHX8iXSNGNqopc7+S8c9mw7tGPqjd h2TG8i2FRatJFu781FHJCQreOQX72Q6t0q8g/uO8c6MxZ+7ZzKIG3C1Yd1bVteqclhW5YD PX2nYGivmTcpSW+4BJl5rGfaxz3p9JfaAkfw1fJ868ul5zti49nC1e0FH4N8Sw== 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 E36CB16142; Mon, 9 May 2022 18:48:24 +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 249ImOPR030688; Mon, 9 May 2022 18:48:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 249ImO36030687; Mon, 9 May 2022 18:48:24 GMT (envelope-from git) Date: Mon, 9 May 2022 18:48:24 GMT Message-Id: <202205091848.249ImO36030687@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: 7b76c79b0b3a - main - linux(4): Regen for prctl fix. 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: 7b76c79b0b3aa2b769e4c6b058243ec65278f361 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652122105; 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=gweOySb4tKPm6L22ksytNb2pKrIpKj0liiCP84fCD7U=; b=rUrFo+A78BLAZ59u2hoUdOFLxDNZ2exYbGYwTGo31xE+coGnY78kkPVWJIaJ/AYWkgvDP1 WO8KIJDnCJcrPv6MhORK0YabSX3XKri2ZV4jllJexwiNpxBF3g+vOUTKaH0jwtOPCgfvP+ cQT5ohAaIy8yPY39MJvUgQTXUn223v3MaGaaaQAViw77vKe2Q7flhBvrnMqhVzYW+alDcd OFedNJhlhgc0u6Tz6htSxtk1sR+3ML7b1Y/6uVi/nW6/IUuyeicrcHN+P3qVC1D/W+xVoc dpPCPS3/AbVZ8VLQiIAXbPlDh3sTfUTAIIwyS2V9RZGpJ1Ni9qoW49rKnGmw/g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652122105; a=rsa-sha256; cv=none; b=wxIiVXqGujsEEvNXs1emG045fuxkGJQaq5cdXeCj690UTxmetS2sFGc3X+5xViAjIG6ZC+ IJZsY77oGoaF6Y8L1UUx66K8uHM7TUm2JgW0TUQWGISr6avQck/Nld3tze5C0Y6dM/M9q9 u6m2kFekStUxXWBOA9bbHYZVqqyln7Mro7b5FBsv0pGa0eBupgpb6PasRZ4DDkihDlVDgH 1rToFuPUj5FUmzBXR0EFx90hZTq6CWt9iNzFYBnfaVEp0JSnOayitNMH16GdbsrfaEJ7Pe UuEfwZnMf4Nj4s7KIMLgjh/CQmF6dLr9sR2JnWPKk9Kn0rSbeezItfxbfUQF4g== 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=7b76c79b0b3aa2b769e4c6b058243ec65278f361 commit 7b76c79b0b3aa2b769e4c6b058243ec65278f361 Author: Dmitry Chagin AuthorDate: 2022-05-09 18:48:15 +0000 Commit: Dmitry Chagin CommitDate: 2022-05-09 18:48:15 +0000 linux(4): Regen for prctl fix. MFC after: 2 weeks --- 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 71b87077778f..219f0f09f8c9 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 8a9f2aeed3d2..fee5cf2c2e2d 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1162,7 +1162,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ - iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg3; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5034,7 +5034,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 e0cbf9e4336a..2e243d463a13 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 717e6b5d80d2..613d1ada1b3f 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1205,7 +1205,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_prctl_args *p = params; iarg[a++] = p->option; /* l_int */ uarg[a++] = (intptr_t)p->arg2; /* l_uintptr_t */ - iarg[a++] = p->arg3; /* l_ulntptr_t */ + uarg[a++] = (intptr_t)p->arg3; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg4; /* l_uintptr_t */ uarg[a++] = (intptr_t)p->arg5; /* l_uintptr_t */ *n_args = 5; @@ -5134,7 +5134,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";