From nobody Sun Jan 02 19:08:19 2022 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 990E5191F9A1; Sun, 2 Jan 2022 19:08:22 +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 4JRpLX3WMZz4YCw; Sun, 2 Jan 2022 19:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 CA5251763E; Sun, 2 Jan 2022 19:08:19 +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 202J8JkJ057916; Sun, 2 Jan 2022 19:08:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 202J8J2M057915; Sun, 2 Jan 2022 19:08:19 GMT (envelope-from git) Date: Sun, 2 Jan 2022 19:08:19 GMT Message-Id: <202201021908.202J8J2M057915@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4d0b07d001a5 - stable/13 - Enforce that vdso does not consume too much from the shared page 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4d0b07d001a55cde50797f3e462a9c32826a028e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641150501; 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=TlmPiRWT5huUCqULsTKQ7X3Hbb74rVdh6P24hLmTAnI=; b=idob7j1XxfTfbrPwT2wGN3ApWVGKZPPIe116ftWyr98VPvQSyh7hx/2BuOFzK1mWpiEEOt 5UyhwqKl0HvUpoxQbo369S+8/4bYA+anfveleFJ2tqrfrNQzMvGxCIqCfZRw1OP8Q07c9x 7jybRIpLz1hE5XXaW7GJvL4VKWvnQ2Mc168J+eYTfCUPazcgUg34BySgUfZmJRcXJdmz7T wE5RnOCaJGwfeCPtGfhx+Hym+qA5XK/oadqcEZHgyouX/Zt7eC4XKzTxRsl7q9zeD+m/v4 3Dhez49rQUHuYPSkcfewtooo4c7WlglU8OvWVm8MlQeU42qNLjUEbFC9tTSeZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641150501; a=rsa-sha256; cv=none; b=ywWjTvBxZNgHm8Tew0/xiOZ1J0Ri1zsm2sMH9veyDuJ5qeV6YPgkdxBRZpTulZWy+X50CW cg6OFFNAyE3zJiBgymXmHN0aI9Q0kncAegwqiotUEBg2Uat5BCS1+wMvrW94DBROhIePRU qVUMAqx+Wdkob1dkq8eBj48r3wxru3CjVbhPRgwFQfZOW4G+ruWVE2+YVEJRja78DESDvB yR9gH5/RGkPQyh7BPwQgF5qXQOXOgBSdOTLsatkVSHJu1HvyKfuZ31lnTHLxCTo+IkK8Va 7hD90DxpccZcZgL7jySDJacfOa343M3uFy6fr4OhmC9mxLbnAMv38VD18Cc9eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4d0b07d001a55cde50797f3e462a9c32826a028e commit 4d0b07d001a55cde50797f3e462a9c32826a028e Author: Konstantin Belousov AuthorDate: 2021-11-18 01:20:08 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-02 16:43:01 +0000 Enforce that vdso does not consume too much from the shared page (cherry picked from commit b0e0b4e7b3795e9beb0cddcfd75261cc9327b5b0) --- sys/tools/amd64_ia32_vdso.sh | 6 ++++++ sys/tools/amd64_vdso.sh | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/sys/tools/amd64_ia32_vdso.sh b/sys/tools/amd64_ia32_vdso.sh index 15ad866b4471..7ef630dbaac5 100644 --- a/sys/tools/amd64_ia32_vdso.sh +++ b/sys/tools/amd64_ia32_vdso.sh @@ -40,6 +40,12 @@ ${LD} --shared -Bsymbolic -soname="elf-vdso32.so.1" \ --hash-style=sysv --fatal-warnings --strip-all \ -o elf-vdso32.so.1 ia32_sigtramp.pico +if [ "$(wc -c elf-vdso32.so.1 | ${AWK} '{print $1}')" -gt 2048 ] +then + echo "elf-vdso32.so.1 too large" 1>&2 + exit 1 +fi + ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso32.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso32_so_1 -DVDSO_FILE=elf-vdso32.so.1 \ diff --git a/sys/tools/amd64_vdso.sh b/sys/tools/amd64_vdso.sh index 6a4111ffabc8..0bb351192407 100644 --- a/sys/tools/amd64_vdso.sh +++ b/sys/tools/amd64_vdso.sh @@ -49,6 +49,12 @@ ${LD} --shared -Bsymbolic -soname="elf-vdso.so.1" \ --hash-style=sysv --fatal-warnings --strip-all \ -o elf-vdso.so.1 sigtramp.pico +if [ "$(wc -c elf-vdso.so.1 | ${AWK} '{print $1}')" -gt 2048 ] +then + echo "elf-vdso.so.1 too large" 1>&2 + exit 1 +fi + ${CC} -x assembler-with-cpp -DLOCORE -fPIC -nostdinc -c \ -o elf-vdso.so.o -I. -I"${S}" -include opt_global.h \ -DVDSO_NAME=elf_vdso_so_1 -DVDSO_FILE=elf-vdso.so.1 \