From nobody Sat Apr 22 19:18:43 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 4Q3h5L69ZQz469Xl; Sat, 22 Apr 2023 19:18:46 +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 4Q3h5J07y4z49jZ; Sat, 22 Apr 2023 19:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682191124; 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=bIM1RQl991sx77oVQxnWjnnjJqcW5m3ZqgDpIwibi3o=; b=UijNK1/kSltpRbuyWWh+CHOI2+AEl9IH45bR2aAM7t7ZZspfi6640106JbGAcFNbS+j4MC Tt4MA0j8FyqcFLilGp+bEbhmSHugV5rTLNbakhLOhk8ONSee9qSRYKcTUxwPD1VoPD3QI8 0B4frzjJyn9a6rwzgexB+bgiQbzrqcvo+7S60hK5YjaBdcEXinsSGwHQZYb/k/UpqUHRUc RtxMjIG5dHM5PjbDGjJDnQceiKopho3ssbuF1anvN+PEVCmI35DjNzjI0skvo1IYkInmVS T/gBtyRArU4iYrBl+q+RKb5GAaj98K/1fflrjorsGbYbt7L4/QADqX1tcZx99Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682191124; 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=bIM1RQl991sx77oVQxnWjnnjJqcW5m3ZqgDpIwibi3o=; b=iRxlO/Ds9fvd/5ZxKNCF5I4pMhYj9dB0GeUAqWRYbHPRRf6HfTlaZ7N8O2c7s74TLwA3NS 566Sh1Gfo/bvGluHmyZ7DXQ0btHN+WIlQgqQikd4P22uBE3Yjuiav+Mn7VGZWVr/vtfU+Y VWHgPiJPbWiF3UwSLCISvRveWbTSW0BYGg5zeRvHyJr6lJ6jsYjwXADIkryv0mMIHL61Rf 6iW6133qVdSf9x9tH4U90EgrL3W125NJCzs1yYMK7F/xAXHWGalqz4N8qVAJ6/30DB70ci 63R4ON1t/Q+1YIaKkfFj9wrRI16Uya63hXW+TzGbsuafnQBdJ2TSxgWV4w8UQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682191124; a=rsa-sha256; cv=none; b=i8Dati4E7NRdesVY4rjKUt65M5g4jaVJ4hQc21MF5LIs5C180ulo0hV19dlU1e5ne8dB15 P14KZVa8qOrGWrqMjt4pyVv/zHolbAIPz1ZDE5aCjvHl6bFXhmnMEkmbSyBt36jne8+FrS QlC1gsHbRQ2UgCfrZ6P672nCgd37TqfPVNu4d/AN+/uO/3qiaG2hMex97n7UDbTNGuZmXE S/+MS8ly1oC1z+oiASi0tjrjX9q0dWPMTClwH7xie8pAx8x/Yw48juJVrnjICpmer4U3B3 7//SVdy26e5t4AbzpggDUUu7D27Pdyfcm69Em1s/7v0C/tLJJtssxEpGLOEC/A== 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 4Q3h5H6M9NzDgy; Sat, 22 Apr 2023 19:18:43 +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 33MJIhqX085169; Sat, 22 Apr 2023 19:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33MJIhJ3085167; Sat, 22 Apr 2023 19:18:43 GMT (envelope-from git) Date: Sat, 22 Apr 2023 19:18:43 GMT Message-Id: <202304221918.33MJIhJ3085167@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: b7a6bcdd1319 - main - 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/main X-Git-Reftype: branch X-Git-Commit: b7a6bcdd1319b4e5da0bfc5e7790cbf26efe9892 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=b7a6bcdd1319b4e5da0bfc5e7790cbf26efe9892 commit b7a6bcdd1319b4e5da0bfc5e7790cbf26efe9892 Author: Dmitry Chagin AuthorDate: 2023-04-22 19:17:52 +0000 Commit: Dmitry Chagin CommitDate: 2023-04-22 19:17:52 +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 --- 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)