From nobody Wed Oct 23 22:13:22 2024 X-Original-To: dev-commits-src-main@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 4XYjwy2vgpz5Zk2P; Wed, 23 Oct 2024 22:13: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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XYjwy1pyWz4cs3; Wed, 23 Oct 2024 22:13:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721602; 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=gccm0gXj22OFK+rPeyWpD+l7h7ykC3iuMb7IWH7SlzY=; b=BYE+YHpWYOWc6md63kzDQBKD26Z/9n87riK3c4Fx144qCYBt8LCd1vXmCaGaPw7pr3N3nG 9YkAEoaLF9GIZHxUDqdKEkeXizm10vI4iePw3p/GwzTTllId2D8nzUIGZIj9ERjFz4Dy/D zzs3otfNz7zcJMkdy9NlBHuhuzJYoSJ58VqB7Tngg+x0/LUP3IycAT/BHGaVZYqntqcQYM 0F0OvJnTs2lxWcbXkkbpUGOJG7/80tHgOUMOR18YHfGhjKrArEwSahaVdXySp1tjdS64R5 612GVCEvDGNpDvVbV7b75CRX64bXh9vB2qT68gIYEDInqsRcVWFZeZVr5haKDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729721602; 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=gccm0gXj22OFK+rPeyWpD+l7h7ykC3iuMb7IWH7SlzY=; b=dG6b3p4F8KtbihYzryIFO1iuP5G5PALLi6+luHgM1l7/yJ5eCPaw/EAVN6rw6qIPFF7zLL 4nXtVK+lxOkkutZAcvd/qb+oTdJOTlrz+95tfsr6q3fItQ73b3IK1+c+JoVfv2U9Z+0aoB +g8AF6EmIuLrYRuSGx70WTCtuTjU5aAMdCHHVp11QFJazq7PeKJrKz/9q5y3/zT31SF0LB 228ZVy8TCHJot5Rjmy0OI3D1cYn6MIUB0ML4+BFRzE3E0FnzzdaQZ0kgqORzz3o/8DR8nF IojT0NsLvgB0AaTJkidBk554df0OYCRfJmxpSXJwJabcKjxW1zc9t8TN033UgQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729721602; a=rsa-sha256; cv=none; b=LyKZ+BwPKq0wg91Q1422hgo2M16VH57m5aSxY3vvo5IZ6YzVSpV4IwXgXvSAR3dqiVCdPd qt6OyBsBYfK2FwRBDMp72QvjOiJfWkm2d6uNoiPwH1S6J4hgpzf0HmUQBNXESgrFBx1Drf QHLDGPSWr0tHXDX+XUFqlHwxUR9KnTRpbuQNG78/jYc6et10fSIZX6hiSgWLo4SjXHo0g2 Ft6YnHrbzPnXqtkh6o1JAZaMYLNPwgrA2Po7O+IJ6UYjFmFEGNx/x3ddLb0h1t242Pvl6s eIvxHnO6Oc1p5E89hU83IS4d2SQmqBele+pzvWyIFzq6KwV8WYvEpGIPn6U7YQ== 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 4XYjwy1Qf8zGfh; Wed, 23 Oct 2024 22:13:22 +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 49NMDMmW085627; Wed, 23 Oct 2024 22:13:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49NMDMwx085624; Wed, 23 Oct 2024 22:13:22 GMT (envelope-from git) Date: Wed, 23 Oct 2024 22:13:22 GMT Message-Id: <202410232213.49NMDMwx085624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 9b2f2fbfcbc5 - main - devmatch: Catch truncated linker hints files List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15 commit 9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15 Author: Mark Johnston AuthorDate: 2024-10-23 16:55:16 +0000 Commit: Mark Johnston CommitDate: 2024-10-23 22:12:45 +0000 devmatch: Catch truncated linker hints files PR: 282268 Reviewed by: christos, imp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47243 --- sbin/devmatch/devmatch.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 49f9be00a2e7..4a5a300ca313 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -127,6 +127,12 @@ read_linker_hints(void) err(1, "Can't open %s for reading", fn); } + if (len < sizeof(int)) { + warnx("Linker hints file too short."); + free(hints); + hints = NULL; + return; + } if (*(int *)(intptr_t)hints != LINKER_HINTS_VERSION) { warnx("Linker hints version %d doesn't match expected %d.", *(int *)(intptr_t)hints, LINKER_HINTS_VERSION);