From nobody Wed Oct 30 13:21:13 2024 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 4Xdnnk2WyZz5bM36; Wed, 30 Oct 2024 13:21:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xdnnj75dsz4hnx; Wed, 30 Oct 2024 13:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730294474; 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=8gixq0nqwtGBb9VYfaFqsozZDTCIAxHP3eAtemc1Yyw=; b=whby/L4OwdJbBp2h+KwcCMbO+Nf+Ia89tl5zHjDldUbfBAcWd+C/UQ83gTzzaByTnwwGl+ xl2Pl2eTPSSLc66APV0UXCdOoRZv+DcJykWw325eSA9v1hzABmSdTZCg7XQpG9MTkJocug fFz9odbxCFtsE5SqZUUydiYxvRBTfujdaaqiiZOrlB/23KDwDBWAYq+m9N1cVcoqzB23ek c7FKkVSP4hokKnUNeNGCvzg9XhUl571X64J/iJKaO2eNmXt/EAq5vY3zA9TmWz8dvCUS2X 1pg23ZAKIOmSHl9Krjw7giv5iAPFByqkvE3iR4xsY9y+gWkwfAejtRi7jz1JHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730294474; 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=8gixq0nqwtGBb9VYfaFqsozZDTCIAxHP3eAtemc1Yyw=; b=fTPXnT57uSaEAjR7UJtIwH6Qf0PyMU/4ZZUzqrCi3laiBIrMucw+tSLcW8OYXb+IMBFgYn nr6/pQyASLqu8qw3NpXpuLpIH4/nPQfBuY15NTeyrmnK7g93NxvLsv2OIzAhj6mNEM4t0O U6Q1hbzMbgjFonzP76OqXBVmvS4Ra6Ry8H/37F937idF7Lm7iZlsdxNA4BTdl8eyG2mN+s hriSrTRw5Dyr5PqWoaNl4YZCyMgj3NRD1KpsP5RvEf5ovsGjqZ0P1kIH657XuSlf5YEYtI iJ+Ccp5L+zXv07BAZLGRBElES4vmrAHKPqBdIlAf3TMVD5bNo6+eLCkgWz16GA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730294474; a=rsa-sha256; cv=none; b=vN86Uifk6NleBGu1/ftlh5lzmUQ2RXb2XKR6YlqK/rZThlzqOyrlk2hSCp5mz/FIcS/KTQ cXcXW8t/rdHPpgU5hXwrZ7g9QRUaHTMt6Scyyys65xrMaB/B2AvBPib4RrcevDeUYi/3RE OUIhaobVh1HpOGlIgwHdktUYPD96BmKQSvp7U0/+8dDhiEmHl+0ELeCptPUnBwkrUWPNpf Ivvbh22kCwIrckAuvP28Nnb8ZDJmAx5if6haI9vfrFwdZYnVUzXe6pXtzSiwNqkTl8x7RY YktsAs6QL0FPzycnt3yJjX1fF71m/mE4a50cFE23wdX9lF4OLLbmIEDLYKqYRQ== 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 4Xdnnj6k2zz17sK; Wed, 30 Oct 2024 13:21:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49UDLDq0087594; Wed, 30 Oct 2024 13:21:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49UDLDvB087591; Wed, 30 Oct 2024 13:21:13 GMT (envelope-from git) Date: Wed, 30 Oct 2024 13:21:13 GMT Message-Id: <202410301321.49UDLDvB087591@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: 9e3e111d749a - stable/14 - linker: Handle a truncated hints file properly 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 9e3e111d749ac83f213a36254fd0717265534e05 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9e3e111d749ac83f213a36254fd0717265534e05 commit 9e3e111d749ac83f213a36254fd0717265534e05 Author: Mark Johnston AuthorDate: 2024-10-23 16:54:56 +0000 Commit: Mark Johnston CommitDate: 2024-10-30 13:21:06 +0000 linker: Handle a truncated hints file properly If vattr.va_size is 0, we will end up accessing invalid memory. This is mostly harmless (because malloc(0) still allocates some memory), but it triggers a KASAN report. PR: 282268 Reviewed by: christos, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47240 (cherry picked from commit b5149b265346c55994c7ebaab2a6a6fd1bd6fe5e) --- sys/kern/kern_linker.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/kern_linker.c b/sys/kern/kern_linker.c index 15fd7e8c30fb..53a743f29459 100644 --- a/sys/kern/kern_linker.c +++ b/sys/kern/kern_linker.c @@ -1947,6 +1947,10 @@ linker_hints_lookup(const char *path, int pathlen, const char *modname, printf("linker.hints file too large %ld\n", (long)vattr.va_size); goto bad; } + if (vattr.va_size < sizeof(ival)) { + printf("linker.hints file truncated\n"); + goto bad; + } hints = malloc(vattr.va_size, M_TEMP, M_WAITOK); error = vn_rdwr(UIO_READ, nd.ni_vp, (caddr_t)hints, vattr.va_size, 0, UIO_SYSSPACE, IO_NODELOCKED, cred, NOCRED, &reclen, td);