openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-05-01 01:27:08 +00:00
Code Issues Projects Releases Wiki Activity

Copy arg to be passed to dirname(). POSIX allows dirname() to modify

Browse Source 
its args and return a pointer into it, so this prevents an overlapping
strlcpy.  bz#3819, patch from cjwatson at debian.org
This commit is contained in:
dtucker
2025-05-22 03:53:46 +00:00
parent 3ac71bda67
commit 533f560f90
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/ssh/misc.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.199 2025/05/05 02:48:06 djm Exp $ */
/* $OpenBSD: misc.c,v 1.200 2025/05/22 03:53:46 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005-2020 Damien Miller. All rights reserved.
@@ -2159,7 +2159,7 @@ int
safe_path(const char *name, struct stat *stp, const char *pw_dir,
uid_t uid, char *err, size_t errlen)
{
char buf[PATH_MAX], homedir[PATH_MAX];
char buf[PATH_MAX], buf2[PATH_MAX], homedir[PATH_MAX];
char *cp;
int comparehome = 0;
struct stat st;
@@ -2185,7 +2185,12 @@ safe_path(const char *name, struct stat *stp, const char *pw_dir,
/* for each component of the canonical path, walking upwards */
for (;;) {
if ((cp = dirname(buf)) == NULL) {
/*
* POSIX allows dirname to modify its argument and return a
* pointer into it, so make a copy to avoid overlapping strlcpy.
*/
strlcpy(buf2, buf, sizeof(buf2));
if ((cp = dirname(buf2)) == NULL) {
snprintf(err, errlen, "dirname() failed");
return -1;
}