Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Oct 2024 22:13:22 GMT
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 9b2f2fbfcbc5 - main - devmatch: Catch truncated linker hints files
Message-ID:  <202410232213.49NMDMwx085624@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15

commit 9b2f2fbfcbc51f77e96a41e62b1c06a8ccd4ca15
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-10-23 16:55:16 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410232213.49NMDMwx085624>