mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2024-12-21 23:18:00 -08:00
Code

create_tempfile: pass pointer to full pathname to strlcat()

Browse Source 
Fixes a potential buffer overrun.  Also check strlcpy() and strlcat()
return value to detect truncations.  Based on a diff from naddy@.
OK naddy@ tb@ deraadt@
This commit is contained in:
millert 2024-10-17 15:38:38 +00:00
parent 6c0a1cff93
commit bdfaa295cd
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/xinstall/xinstall.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: xinstall.c,v 1.77 2022/12/04 23:50:50 cheloha Exp $ */
/* $OpenBSD: xinstall.c,v 1.78 2024/10/17 15:38:38 millert Exp $ */
/* $NetBSD: xinstall.c,v 1.9 1995/12/20 10:25:17 jonathan Exp $ */
/*
@ -621,13 +621,19 @@ create_tempfile(char *path, char *temp, size_t tsize)
{
char *p;
strlcpy(temp, path, tsize);
if (strlcpy(temp, path, tsize) >= tsize) {
errno = ENAMETOOLONG;
return(-1);
}
if ((p = strrchr(temp, '/')) != NULL)
p++;
else
p = temp;
*p = '\0';
strlcat(p, "INS@XXXXXXXXXX", tsize);
if (strlcat(temp, "INS@XXXXXXXXXX", tsize) >= tsize) {
errno = ENAMETOOLONG;
return(-1);
}
return(mkstemp(temp));
}