From nobody Fri Jun 17 19:32:15 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 7E205854309; Fri, 17 Jun 2022 19:32:16 +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 4LPq1W4SDBz3KHV; Fri, 17 Jun 2022 19:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494335; 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=HdXzv2iLSgrNnhSRV5Sc6CCDIwmbPqkZShfJUhQzcTk=; b=QnxI5clihjBpGTMQUNSrkXLu5NH2rUeghwJUxXZc0rEsYSHYUoKOfhkT2JUwb8tovpTFWw 1uqQ14YFNoucB9v7zKm/86ewHT9LZM2P/P9GSuFsZC7OuxIwyvHUvxsdktbu3r25l/Ngkr zmASCBjkZxQSR9fWw9Ans+8bHlQck52xTvoMBamfR7tgYIBjomR2tTvBQ/LnZ48N6IKydy Ed6khwVUyVkyeWWK/syxd8e+COL27ESlhew+gZMOqMHLhcaMyiwZbHirhbScYsqz4/eUHq uE755+wydu/mLKPkAK941+KNu3Ln9xU3CqnDkpsi3Byf/D4zf28F62B6ThTscQ== 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 18FA42556F; Fri, 17 Jun 2022 19:32:15 +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 25HJWFF2008215; Fri, 17 Jun 2022 19:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJWFLn008214; Fri, 17 Jun 2022 19:32:15 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:32:15 GMT Message-Id: <202206171932.25HJWFLn008214@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: ba40604902f1 - stable/13 - LinuxKPI: Use the proper API to determine the ABI of the running process. 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: ba40604902f1e7489e90e08c06ed1c46ad7695c6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494335; 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=HdXzv2iLSgrNnhSRV5Sc6CCDIwmbPqkZShfJUhQzcTk=; b=AKybIvwA6G9lfXzmpT4qVyfHP4XAuLNABVb9YZO0pWMv0mwqxlZCf+NWkIdlMhUoyGq/HR QuM2fDJBIdu1UwSxDJ/ExOuG5qhUwVswErIDfvGa8j18g2zHyMf8cOXmEuUIr2fer8VXgR +2x59F6Q1w9T1Euh9ov9ChNZ8ftwFyjWSYDKw8Qa9E7CJ2ota6Re1fhtITQ/MbFOO6cepk z72Q4xj6iI5S+hRz4gCZkZYPx0xguH1F7U+tvRl0cRoWAwWNxaDmYLIdsOmRBiuagoA1g9 N9uV47v+9CzGwg5fo4KOY4dOnTAEkQleO3k8F6SRNMDf+GddS2negenjtl06JQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494335; a=rsa-sha256; cv=none; b=KDgp70AO06gGOgc16H+B8lgow0VIG0xQsf3Zj3cQw2KMtHmEI+QUGUJnOhpJTAT+cWr2Na 5U8Kdj+DbWgiThnEF7UKOhnu5MnfolCXpomN5R1MXy3SRU9VjJ0CRw4eSFcjGgP9DpJ0+W KzPAeEK/Aw5xUbekl5NYT07ocHVphf8jtzDwtVZbLm9ctysueVR4JP3QoHAO/wxd42Dmv7 HkIfu9TJELBCBuOPIYsYn0P9HpCN5aiIU6yXBKg+XtSKOiXH9aRFr6pBfKOz1EQHBXLspz o+FrvU4jkHhp+rSe//ObpoHK5Z/uIp8UC0zE/i+r7pBprPP9GetxgYUoDCWRUg== 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=ba40604902f1e7489e90e08c06ed1c46ad7695c6 commit ba40604902f1e7489e90e08c06ed1c46ad7695c6 Author: Dmitry Chagin AuthorDate: 2021-06-29 17:17:16 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:30:26 +0000 LinuxKPI: Use the proper API to determine the ABI of the running process. Reviewed by: markj, hselasky, kib Differential Revision: https://reviews.freebsd.org/D30924 MFC after: 2 weeks (cherry picked from commit 945accf502db0dd44522489857f461e29ef17d30) --- sys/compat/linuxkpi/common/src/linux_compat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c index a574f8bad0f1..f3e018796249 100644 --- a/sys/compat/linuxkpi/common/src/linux_compat.c +++ b/sys/compat/linuxkpi/common/src/linux_compat.c @@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include @@ -1096,7 +1097,7 @@ linux_file_ioctl_sub(struct file *fp, struct linux_file *filp, data = *(void **)data; } #if defined(__amd64__) - if (td->td_proc->p_elf_machine == EM_386) { + if (SV_PROC_FLAG(td->td_proc, SV_ILP32)) { /* try the compat IOCTL handler first */ if (fop->compat_ioctl != NULL) { error = -OPW(fp, td, fop->compat_ioctl(filp,