From nobody Thu Jun 29 08:20:05 2023 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 4QsBFy1cCBz4knTc; Thu, 29 Jun 2023 08:20:06 +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 4QsBFy15t1z3sqM; Thu, 29 Jun 2023 08:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026806; 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=uMD019MOw+m+jTAsnSKrNv+dGqIR7vtX6o9+1LZIyho=; b=pwzNaUs4aW4q1Xan4LWaEsVx35G44c8/YL1McHAzIPl3qIjrg2tfW1m+f0eJ+41oNmWGjY BZJ+PJ2Rx3l2ZjUL4FClKg/yxJ9jPFYm1BZfgMKWqy70035CnOlE1lm0J2w/FfqQjOKFbA dlGC9EiSatvCcjfGQSKgYIexivcBSM/fmlpOfpG4aWC2LgobIJtEjUeXGoaiHn5xwaLR6G SgW9r6CzlH+iSD7YoIlhmUryCQDhTOy4QMcG/jeovt4G/ehYqZBgLQ85SeXIOxmwINAadi Wluw+fLxwL1nRPRxCNLl/1Zh8M2mKK9Esb7LURbV82oGGLH+YlPZl3QNaWPMqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026806; 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=uMD019MOw+m+jTAsnSKrNv+dGqIR7vtX6o9+1LZIyho=; b=kjCluN/12Fv0XXIE2Xh6EYcLjSCP5aqzJ+QW55DuT0x+DoWEANRS+FBTyU0erAU3MyKuhx dLII4tsK/hVFDYFRkRFNiayRo6HZ0/5UP8ZwBAl9BjAPFXSNKY0nxmTCKWFio617dd2FYr EjU8QOai9SkVG5W0E56swdCHOTRLQ4/Fgff0JNfQmeupSvRPdZuEBkzHLgMYm74kwuwK8f DcLiJWBVFFzn439UzDPpcTH4L35SMqhRgycPdZFRZ8P7rdPds7YB8DDUbClWlK9/LaCHeE F4HEqJlk39YaR/JIbX8Dj9yfcd8iG70n3Z0AUbOLUI/mkxMGr20SiK+wzjW8tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026806; a=rsa-sha256; cv=none; b=v72OE1pcdpNX4eNURv62MGnSMrzlEP++kmKmLKz+S008XKLVWqhBuvgqEl8q/Xt/ZHJYVm W/Gx0aD30vf2EzXar/s81/Obs7FEV2cvI1CkTUVS4MblpCPdwh0nWi1/WWX1CVYIym1flI x93jzxZCwF7aXI8p8n+E88oBRc6wWxXwx3wlmLXVaPs8Ms1/19h4dtS6dvNUqq+6wlJYAs /UPtkSgG2jhj79/BLQI84h4fesJU2p+rHEOoLHp/8Q8CkP2eVfKCU+VHByO2IAwxICZqjT brcAKPvCMHkX2sNixFzZWs2rMZHZ8ML2PEEvBawkWvxzPiHX9EZ/d7XSLdqhEw== 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 4QsBFx72yzz17QK; Thu, 29 Jun 2023 08:20:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 35T8K5i2077481; Thu, 29 Jun 2023 08:20:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8K5CV077479; Thu, 29 Jun 2023 08:20:05 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:05 GMT Message-Id: <202306290820.35T8K5CV077479@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: de67d174a10c - stable/13 - linux(4): Export the AT_RANDOM depending on the process osreldata 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: de67d174a10c296e6d44499d0c577cd0e9d048ef Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=de67d174a10c296e6d44499d0c577cd0e9d048ef commit de67d174a10c296e6d44499d0c577cd0e9d048ef Author: Dmitry Chagin AuthorDate: 2023-04-22 19:17:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:26 +0000 linux(4): Export the AT_RANDOM depending on the process osreldata AT_RANDOM has appeared in the 2.6.30 Linux kernel first time. Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D39646 MFC after: 1 month (cherry picked from commit 40c36c4674eb9602709cf9d0483a4f34ad9753f6) --- 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 9b2c38aba444..d0e547c1b882 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -526,7 +526,8 @@ __linuxN(copyout_auxargs)(struct image_params *imgp, uintptr_t base) AUXARGS_ENTRY(pos, AT_GID, imgp->proc->p_ucred->cr_rgid); AUXARGS_ENTRY(pos, AT_EGID, imgp->proc->p_ucred->cr_svgid); AUXARGS_ENTRY(pos, LINUX_AT_SECURE, issetugid); - AUXARGS_ENTRY_PTR(pos, LINUX_AT_RANDOM, imgp->canary); + if (p->p_osrel >= LINUX_KERNVER_2006030 || p->p_osrel == 0) + AUXARGS_ENTRY_PTR(pos, LINUX_AT_RANDOM, imgp->canary); if (imgp->execpathp != 0) AUXARGS_ENTRY(pos, LINUX_AT_EXECFN, PTROUT(imgp->execpathp)); if (args->execfd != -1) diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h index 615439b4d107..b1d5a0981a7d 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_2006030 LINUX_KERNVER(2,6,30) #define LINUX_KERNVER_2006039 LINUX_KERNVER(2,6,39) #define LINUX_KERNVER_5004000 LINUX_KERNVER(5,4,0)