From nobody Tue Oct 25 12:45:26 2022 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 4MxWr66gs2z4fNt0; Tue, 25 Oct 2022 12:45:26 +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 4MxWr66Cghz3jLq; Tue, 25 Oct 2022 12:45:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666701926; 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=H4kajzpbzFOfZdMDKluNOYsh/OgmmRuu1pZYJayf6Yg=; b=REvvemW6cH3aGLPCgKZMLHg6L7BW36RD6Oxow9CmAx6b+gGLqu+OydDiOGHekO8Hy728tR cYo9feK8zCWMhfOGg6EcjVc7tb+38uiVPkHvYubLVi+5/zFQj4RMVYxTVJn7MYXFd5ewHk N72EBkSeD55nIXo1lpQgLZPep+kT9k2WfaMGG0PNlksYLy7tV5FmRb+mnX5EnjCRunp3hz IW8eiEijFbXT3uBiSpO8pOevApXoaTMkwugDdZswgMMPcTphnDW9fSvznD6g2sGl/ze1CU /xH75wANd3vib6qHEWwWijTIvYqI1B8cRqhUJebvazBmJRpZR3/G18S6ZyzPWg== 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 4MxWr65FlrzdYm; Tue, 25 Oct 2022 12:45:26 +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 29PCjQ80010073; Tue, 25 Oct 2022 12:45:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PCjQGV010072; Tue, 25 Oct 2022 12:45:26 GMT (envelope-from git) Date: Tue, 25 Oct 2022 12:45:26 GMT Message-Id: <202210251245.29PCjQGV010072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 6dde65fa74a3 - stable/13 - libc: Make elf_aux_info() return an error if AT_USRSTACK* is undefined 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6dde65fa74a3a442973039bcad33b2f145439ec9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666701926; 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=H4kajzpbzFOfZdMDKluNOYsh/OgmmRuu1pZYJayf6Yg=; b=OQb5RTIzibEiUIW83abgvL0vPodEUzMPk3K27hvBVulG3rYk5p1kU1iYWpQHPD5ekjiR+6 MCdrHKIjiGqhHZeISkAKNGgKdatEvnwLgb4vNyMZrkijCpqxk/K4lGd3R/uUjeSi4JTkMt H23gpMabWuwrh/fhW6uU3FvLPyUUWQSr/05LXWgLYhgxT+6Ppu0PIb3ModQP4/lnyYiHaG zGOdIalI2P7d6+PoQbCpjtH0abFA3HbwxNeycA0D2DSEMs7CGF3n1stnyoBbUB4PHEkYuM wXAljRswUTQ1ZUJbNrH7qriVs8oqiO8KbHFMl0kHS9jeHzS99dXXz7ZdtkSiYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666701926; a=rsa-sha256; cv=none; b=vWVK4Ez84t6shn3PyUw9xR/QiZy/pvK7jIp8iLfjhLo5U1oCxzgjaUgzG067XT9D3ftgtl +PjjeItUaCmGVJvtUZA99UW4J50iKM6b/VPP5L2G3191o8TNbqPlantp/PQAhlw0qvRESZ ZNSbr4xpSzFST9c5yXDw0ylWV5YJC7E+ZnwfgVI7un3ddsn1QHFUX02AMBlIkbsuBBdBH7 Mt9Omf5kGc8jamzqxJh+nrphr0VEyU++GrhI2FJ6eeHOxg0wLss3A6VFu48LHfKkfIZ1ZY rXpn//+8ZXAy43HYpA7cSsiUGHMw+nAeKn2fRL8DtKPHk7HTPynGzkNLqBDkiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=6dde65fa74a3a442973039bcad33b2f145439ec9 commit 6dde65fa74a3a442973039bcad33b2f145439ec9 Author: Mark Johnston AuthorDate: 2022-10-18 22:11:26 +0000 Commit: Mark Johnston CommitDate: 2022-10-25 12:45:08 +0000 libc: Make elf_aux_info() return an error if AT_USRSTACK* is undefined Otherwise we do not fall back to sysctls if the auxv entries are not defined by the kernel. Arguably this is not a bug since we do not support newer libc running on an older kernel, but we can be a bit more gentle for the benefit of Valgrind or any other software which synthesizes the auxv for virtualization purposes. Reported by: Paul Floyd Reviewed by: brooks, kib (cherry picked from commit a4ee0edc4a0b3f880463021c7ae1bdcf7112f3d6) --- lib/libc/gen/auxv.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/auxv.c b/lib/libc/gen/auxv.c index af59a2dda90a..2f043f8814cf 100644 --- a/lib/libc/gen/auxv.c +++ b/lib/libc/gen/auxv.c @@ -381,15 +381,21 @@ _elf_aux_info(int aux, void *buf, int buflen) break; case AT_USRSTACKBASE: if (buflen == sizeof(u_long)) { - *(u_long *)buf = usrstackbase; - res = 0; + if (usrstackbase != 0) { + *(u_long *)buf = usrstackbase; + res = 0; + } else + res = ENOENT; } else res = EINVAL; break; case AT_USRSTACKLIM: if (buflen == sizeof(u_long)) { - *(u_long *)buf = usrstacklim; - res = 0; + if (usrstacklim != 0) { + *(u_long *)buf = usrstacklim; + res = 0; + } else + res = ENOENT; } else res = EINVAL; break;