From nobody Thu Jun 29 08:20:08 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 4QsBG05THhz4knYX; Thu, 29 Jun 2023 08:20:08 +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 4QsBG028WBz3sx2; Thu, 29 Jun 2023 08:20:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026808; 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=H8aPOlLs1YDFmK4foj6yHjmGtTUvKQOJSNnjtl9zfMc=; b=F/d3GHS7js4KbaGCxE06pRsYuLsMcZWUPTTPry4gbaDu7mcsqa+ebzeYWbGXbK22u9k4n2 1u5G4iePb1vygISu5eS+dLoC64fCMYWUIIEuGznnc5c4Pa9mx8IKXIDFT+XSRR1wpTSFRE N/BTTXdFaYdwT69kD/5O9/pAbhMIrXsjKd9K3BnhHCQOZX0TYjUKS+B3GhddhqKrhHm0tC O55yMhOCNg5NbtAclPTwqrf76WnTSkNyY+WTWtCS1tz38Z14QxAZ+ORADwzYwBl+mBPA7x TWp7w4XL5JygmUzFasxEDXCRp8AsFd7/S9MQKzGG49ZKS85fAg4nVYMRaR15KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688026808; 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=H8aPOlLs1YDFmK4foj6yHjmGtTUvKQOJSNnjtl9zfMc=; b=GsGqDJN80I+puYJHAJ5z4lA7RNFipzTKfXNAikHe9enRTPTNfdL0DDDTJHFawrt1KMRg7b 9v9mkSXfigtGK+/28yCog1OY1fSaSadU8z4Ir6DGAjGGw/qUQc9OLqPjJLdTZCgcVl1d5v g8kVUswpDk53cCopeuFOlrPjCMOud3o04G4HHvoP16VJRtQFZ8n+obzha8ShH7pnlqtKFR /nr7Dnelc5OooPd9eQCpb7TcpEI0J37ENrhC1rSTdOgd5ZHv4wu7PKjB2FtRaNLaogDIth UZKbwjkA7OMRfhk4zmaOkl0YavUczMDoiVbRn2ITXqe/B+O/LvGMMLylKTymZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688026808; a=rsa-sha256; cv=none; b=jjnxKSk2f+o1pcHLvAkhvDjrSgYy7RfHXK8hpzJYLvm/qY6ObaDbY0IM7u23X0cgyMYZe2 /dHdwTvqR+9s0Mrsfxi9egdbqy9oo5j5N5Ebx9CkEKR3O83eGjflrrfh6ImwDXkrxt7QP+ AzI2a8mMwepEr+lhhBmAiHI5nnt8Y9WFDdPT0W4YqfQd2E4Yhgk1LdGmeCQmA6kW+xURxl 9uaBLtSBO2QwJrXuIDt1UrXsoZRq9rJd9tpk2hHZu1T6ue3v7dwLCgU1eCKeqDNTUSkS2v P50J87q3SCvqq+aHlEjHpnQJfRRrDmBCyWmUDH0FLIvoDksULObk63QvW7Hg9g== 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 4QsBG019s6z17dZ; Thu, 29 Jun 2023 08:20:08 +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 35T8K8Vf078006; Thu, 29 Jun 2023 08:20:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 35T8K893078003; Thu, 29 Jun 2023 08:20:08 GMT (envelope-from git) Date: Thu, 29 Jun 2023 08:20:08 GMT Message-Id: <202306290820.35T8K893078003@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: 8dc4c073cdd1 - stable/13 - linux(4): Export the AT_MINSIGSTKSZ 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 8dc4c073cdd1e2452dd725bc324977038366f3e6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=8dc4c073cdd1e2452dd725bc324977038366f3e6 commit 8dc4c073cdd1e2452dd725bc324977038366f3e6 Author: Dmitry Chagin AuthorDate: 2023-04-22 19:17:52 +0000 Commit: Dmitry Chagin CommitDate: 2023-06-29 08:15:27 +0000 linux(4): Export the AT_MINSIGSTKSZ depending on the process osreldata AT_MINSIGSTKSZ has appeared in the 5.13.0 Linux kernel first time. Differential Revision: https://reviews.freebsd.org/D39648 MFC after: 1 month (cherry picked from commit b7a6bcdd1319b4e5da0bfc5e7790cbf26efe9892) --- 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 a1a04e23d43d..9db599d83bac 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -533,7 +533,8 @@ __linuxN(copyout_auxargs)(struct image_params *imgp, uintptr_t base) AUXARGS_ENTRY(pos, LINUX_AT_EXECFN, PTROUT(imgp->execpathp)); if (args->execfd != -1) AUXARGS_ENTRY(pos, AT_EXECFD, args->execfd); - AUXARGS_ENTRY(pos, LINUX_AT_MINSIGSTKSZ, LINUX_MINSIGSTKSZ); + if (p->p_osrel >= LINUX_KERNVER_5013000 || p->p_osrel == 0) + AUXARGS_ENTRY(pos, LINUX_AT_MINSIGSTKSZ, LINUX_MINSIGSTKSZ); AUXARGS_ENTRY(pos, AT_NULL, 0); free(imgp->auxargs, M_TEMP); diff --git a/sys/compat/linux/linux_mib.h b/sys/compat/linux/linux_mib.h index 05068bbf1029..ae650934273e 100644 --- a/sys/compat/linux/linux_mib.h +++ b/sys/compat/linux/linux_mib.h @@ -62,6 +62,7 @@ int linux_kernver(struct thread *td); #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) +#define LINUX_KERNVER_5013000 LINUX_KERNVER(5,13,0) #define linux_use54(t) (linux_kernver(t) >= LINUX_KERNVER_5004000)