From nobody Sat Apr 22 19:18:42 2023 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 4Q3h5K5FjLz469ZP; Sat, 22 Apr 2023 19:18:45 +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 4Q3h5H1g88z49Rs; Sat, 22 Apr 2023 19:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682191123; 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=2yPO4k0KGTXH9j5VQ07UkgDinr7uYtVXqO4zdqnxiio=; b=FPTyl6TFepDd2687uMNfUWqqnPdykpHnMRFbXV1fmZKkYsFymzl0Ui+sxIs0jsHjsW/X3E oD1feGyo22TudR3+fshovCgHFgBYVmpno2G0gwDsCf8/b3ADrKBvLZihl8wI+33TuXmdnZ USdS5BRntW5L7qMcXaOpLNQvPmc6qXiNEprQ9KVTaU6tzudxYMMAb0zl+p2hhRszpxH8JK i4n3S1W8SFaIHvm5ZbygPTGuHzDgdW4y5bJFPgDHSwZ9wAUv9if32huL4keuggqLWxrEAC +c/C3xuFqGNpeE/uVD7MWDzhOMZqEfj5TqfQliM+K+PtNPIL8X3t12RzDu2anQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682191123; 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=2yPO4k0KGTXH9j5VQ07UkgDinr7uYtVXqO4zdqnxiio=; b=TTwusgz+gJzZwqZ3L4coE5K9dzXzpQpTNIK+2BSWrZFvVBReN1CeHPns8dISf35p53plA5 hPtXe9ur9ocRO/phucFyaa62/TksR7Mq2KElV0MzfMj3zVBU/g4xIfJotDKERqLZn+2gnU XOE5FvbSexG9G1MRDR7FpVMQKKuKTeUSKnxZxhDkSlI2I0qDoOB47xn1OeILK1vBbiO7Ps 4buliisG2NE74nqHrF2ealAqTkgHGAIXjKXeCCmZ0Nbv74nT8Rn6Ndd4ZJh+PqrO+QBZPw lKwhQAs4iedbMYgHBqJ/RUpdwBE3+ANKathW2EKFYCRpJ6fRQDlEqdDYFMtjCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682191123; a=rsa-sha256; cv=none; b=CdoUSbtpcpBD2YIth99GURhZhGpkj8INc9HynRXBnVY+PmsL8lGVVtfahYLUwGeMUz1rk6 k30ylyB31OUVQW5EeJ6QrYc6ZUZlOp3HXlLSYiULOs1wvTf4Wd2vKja1H0OO6yWveIwKDo oo8dvKwv8Ni9BNXXuzwLdPh/TMO4n80fM1Bjxg6q8WXW3VEUigeGQMgY9Q7uTD71VsWln1 /oO+WFYMoIKHyRmZT+cC7X3CPO5Iy0LO95ybk9xlKlqeaWOGEPE2D8+R05B6ywQcoRCD8+ EY2src86pMw+vzotz3e/7XgpU3v/aecIRuxykV72nr97uhp6C02AKHF+GGXRMw== 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 4Q3h5G5R6zzDdP; Sat, 22 Apr 2023 19:18:42 +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 33MJIgIJ085149; Sat, 22 Apr 2023 19:18:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MJIgRu085148; Sat, 22 Apr 2023 19:18:42 GMT (envelope-from git) Date: Sat, 22 Apr 2023 19:18:42 GMT Message-Id: <202304221918.33MJIgRu085148@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: 70eab81d6ffe - main - linux(4): Export the AT_EXECFN depending on the process osreldata 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/main X-Git-Reftype: branch X-Git-Commit: 70eab81d6ffecf0ba4c7f19a8b6389178eda5259 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=70eab81d6ffecf0ba4c7f19a8b6389178eda5259 commit 70eab81d6ffecf0ba4c7f19a8b6389178eda5259 Author: Dmitry Chagin AuthorDate: 2023-04-22 19:17:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-22 19:17:36 +0000 linux(4): Export the AT_EXECFN depending on the process osreldata AT_EXECFN has appeared in the 2.6.26 Linux kernel first time. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39647 MFC after: 1 month --- sys/compat/linux/linux_elf.c | 3 ++- sys/compat/linux/linux_mib.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_elf.c b/sys/compat/linux/linux_elf.c index d0e547c1b882..a1a04e23d43d 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -528,7 +528,8 @@ __linuxN(copyout_auxargs)(struct image_params *imgp, uintptr_t base) AUXARGS_ENTRY(pos, LINUX_AT_SECURE, issetugid); if (p->p_osrel >= LINUX_KERNVER_2006030 || p->p_osrel == 0) AUXARGS_ENTRY_PTR(pos, LINUX_AT_RANDOM, imgp->canary); - if (imgp->execpathp != 0) + if ((p->p_osrel >= LINUX_KERNVER_2006026 || p->p_osrel == 0) && + imgp->execpathp != 0) AUXARGS_ENTRY(pos, LINUX_AT_EXECFN, PTROUT(imgp->execpathp)); if (args->execfd != -1) AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h index b1d5a0981a7d..05068bbf1029 100644 --- a/sys/compat/linux/linux_mib.h +++ b/sys/compat/linux/linux_mib.h @@ -58,6 +58,7 @@ int linux_kernver(struct thread *td); #define LINUX_VERSION_STR LINUX_XKERNVERSTR(LINUX_KVERSION.LINUX_KPATCHLEVEL.LINUX_KSUBLEVEL) #define LINUX_KERNVER_2004000 LINUX_KERNVER(2,4,0) +#define LINUX_KERNVER_2006026 LINUX_KERNVER(2,6,26) #define LINUX_KERNVER_2006030 LINUX_KERNVER(2,6,30) #define LINUX_KERNVER_2006039 LINUX_KERNVER(2,6,39) #define LINUX_KERNVER_5004000 LINUX_KERNVER(5,4,0)