Module Name: src
Committed By: joerg
Date: Sat Aug 7 19:47:35 UTC 2010
Modified Files:
src/libexec/ld.elf_so: search.c
Log Message:
Stricter matching for _rtld_invalid_paths by ensuring separator.
Use mem* functions instead of str* for strings of known size.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/libexec/ld.elf_so/search.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/search.c
diff -u src/libexec/ld.elf_so/search.c:1.21 src/libexec/ld.elf_so/search.c:1.22
--- src/libexec/ld.elf_so/search.c:1.21 Tue Mar 21 17:48:10 2006
+++ src/libexec/ld.elf_so/search.c Sat Aug 7 19:47:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: search.c,v 1.21 2006/03/21 17:48:10 christos Exp $ */
+/* $NetBSD: search.c,v 1.22 2010/08/07 19:47:34 joerg Exp $ */
/*
* Copyright 1996 Matt Thomas <[email protected]>
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: search.c,v 1.21 2006/03/21 17:48:10 christos Exp $");
+__RCSID("$NetBSD: search.c,v 1.22 2010/08/07 19:47:34 joerg Exp $");
#endif /* not lint */
#include <err.h>
@@ -80,15 +80,17 @@
for (sp = _rtld_invalid_paths; sp != NULL; sp = sp->sp_next) {
if (sp->sp_pathlen == pathnamelen &&
+ sp->sp_path[dirlen] == '/' &&
!memcmp(name, sp->sp_path + dirlen + 1, namelen) &&
!memcmp(dir, sp->sp_path, dirlen)) {
return NULL;
}
}
- (void)strncpy(pathname, dir, dirlen);
+ memcpy(pathname, dir, dirlen);
pathname[dirlen] = '/';
- strcpy(pathname + dirlen + 1, name);
+ memcpy(pathname + dirlen + 1, name, namelen);
+ pathname[pathnamelen] = '\0';
dbg((" Trying \"%s\"", pathname));
obj = _rtld_load_object(pathname, mode);
