jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 15:00:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WINNT: Use safer string functions in DumpAfsLog

Browse Source 
Replace strcpy, strcat, and sprintf with safer string functions in the
tests/torture/DumpAfsLog program.  Add checks for string truncation
where needed.

Change-Id: I4eac12e73bbeaeadc0a8a6b5ebded664ca91b7f8
Reviewed-on: https://gerrit.openafs.org/15489
Reviewed-by: Cheyenne Wills <cwills@sinenomine.net>
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Reviewed-by: Gaurav Saxena <gsaxena@sinenomine.net>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Tested-by: Michael Meffie <mmeffie@sinenomine.net>
This commit is contained in:
Cheyenne Wills 2024-10-21 10:44:29 -06:00 committed by Michael Meffie
parent 1fdc1812ce
commit e1bb50849e
2 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
src/WINNT/tests/torture/DumpAfsLog/DumpAfsLog.c
View File

@ -1,6 +1,10 @@
// Stress.cpp : Defines the entry point for the console application.
//
#include <afsconfig.h>
#include <afs/param.h>
#include <roken.h>
#include <windows.h>
#include <stdlib.h>
#include <time.h>
@ -37,7 +41,7 @@ int main(int argc, char* argv[])
SecondsToRun = 30 * 60;
memset(HostName, '\0', sizeof(HostName));
memset(command, '\0', sizeof(command));
strcpy(LoggingDrive, "C");
strlcpy(LoggingDrive, "C", sizeof(LoggingDrive));
MiniDump = 0;
for (i = 0; i < argc; i++)
@ -52,13 +56,23 @@ int main(int argc, char* argv[])
}
if (!stricmp(argv[i], "-h"))
{
strcpy(HostName, argv[i+1]);
if (strlcpy(HostName, argv[i+1], sizeof(HostName)) >= sizeof(HostName)) {
fprintf(stderr, "Local host name exceeds maximum length: %s\n", argv[i+1]);
exit(-1);
}
}
if (!stricmp(argv[i], "-d"))
{
strcpy(LoggingDrive, argv[i+1]);
if (strlen(LoggingDrive) == 1)
strcat(LoggingDrive,":");
if (strlcpy(LoggingDrive, argv[i+1], sizeof(LoggingDrive)) >= sizeof(LoggingDrive)) {
fprintf(stderr, "Local drive letter exceeds maximum length: %s\n", argv[i+1]);
exit(-1);
}
if (strlen(LoggingDrive) == 1) {
if (strlcat(LoggingDrive,":", sizeof(LoggingDrive)) >= sizeof(LoggingDrive)) {
fprintf(stderr, "Local drive letter exceeds maximum length: %s\n", argv[i+1]);
exit(-1);
}
}
}
if (!stricmp(argv[i], "-m"))
{
@ -81,18 +95,25 @@ int main(int argc, char* argv[])
hStdin = GetStdHandle(STD_INPUT_HANDLE);
sprintf(command, "fs trace -on");
rc = system(command);
sprintf(command, "fs trace -reset");
rc = system(command);
rc = system("fs trace -on");
rc = system("fs trace -reset");
GetCurrentDirectory(sizeof(WorkingDirectory), WorkingDirectory);
if (WorkingDirectory[0] != LoggingDrive[0])
WorkingDirectory[0] = LoggingDrive[0];
sprintf(command, "rmdir /Q /S %s\\DumpAfsLogDir", WorkingDirectory);
if (snprintf(command, sizeof(command), "rmdir /Q /S %s\\DumpAfsLogDir", WorkingDirectory) >= sizeof(command)) {
fprintf(stderr, "Command string exceeds maximum length: %s..\n", command);
exit(1);
}
rc = system(command);
sprintf(LogName, "%s\\DumpAfsLogDir", WorkingDirectory);
sprintf(command, "mkdir %s\\DumpAfsLogDir", WorkingDirectory);
if (snprintf(LogName, sizeof(LogName), "%s\\DumpAfsLogDir", WorkingDirectory) >= sizeof(command)) {
fprintf(stderr, "Path to logname exceeds maximum length: %s..\n", LogName);
exit(1);
}
if (snprintf(command, sizeof(command), "mkdir %s\\DumpAfsLogDir", WorkingDirectory) >= sizeof(command)) {
fprintf(stderr, "Command string exceeds maximum length: %s..\n", command);
exit(1);
}
rc = system(command);
time(&StartTime);
@ -102,27 +123,43 @@ int main(int argc, char* argv[])
if (MiniDump)
{
printf("\n");
sprintf(command, "fs minidump");
rc = system(command);
rc = system("fs minidump");
ExpandEnvironmentStrings("%windir%", EnvVariable, sizeof(EnvVariable));
strcat(EnvVariable, "\\TEMP\\afsd.dmp");
sprintf(command, "copy /Y %s %s\\DumpAfsLogDir", EnvVariable, WorkingDirectory);
if (strlcat(EnvVariable, "\\TEMP\\afsd.dmp", sizeof(EnvVariable)) >= sizeof(EnvVariable)) {
fprintf(stderr, "Path name exceeds maximum length: %s..\n", EnvVariable);
exit(1);
}
if (snprintf(command, sizeof(command), "copy /Y %s %s\\DumpAfsLogDir", EnvVariable, WorkingDirectory) >= sizeof(command)) {
fprintf(stderr, "Command string exceeds maximum length: %s..\n", command);
exit(1);
}
printf("%s\n", command);
rc = system(command);
sprintf(command, "rename %s\\DumpAfsLogDir\\afsd.dmp afsd_%05d.dmp", WorkingDirectory, Count);
if (snprintf(command, sizeof(command), "rename %s\\DumpAfsLogDir\\afsd.dmp afsd_%05d.dmp", WorkingDirectory, Count) >= sizeof(command)) {
fprintf(stderr, "Command string exceeds maximum length: %s..\n", command);
exit(1);
}
printf("%s\n", command);
rc = system(command);
}
printf("\n");
sprintf(command, "fs trace -dump");
rc = system(command);
rc = system("fs trace -dump");
ExpandEnvironmentStrings("%windir%", EnvVariable, sizeof(EnvVariable));
strcat(EnvVariable, "\\TEMP\\afsd.log");
sprintf(command, "copy /Y %s %s\\DumpAfsLogDir", EnvVariable, WorkingDirectory);
if (strlcat(EnvVariable, "\\TEMP\\afsd.log", sizeof(EnvVariable)) >= sizeof(EnvVariable)) {
fprintf(stderr, "Path name exceeds maximum length: %s..\n", EnvVariable);
exit(1);
}
if (snprintf(command, sizeof(command), "copy /Y %s %s\\DumpAfsLogDir", EnvVariable, WorkingDirectory) >= sizeof(command)) {
fprintf(stderr, "Command string exceeds maximum length: %s..\n", command);
exit(1);
}
printf("%s\n", command);
rc = system(command);
sprintf(command, "rename %s\\DumpAfsLogDir\\afsd.log afsd_%05d.log", WorkingDirectory, Count);
if (snprintf(command, sizeof(command), "rename %s\\DumpAfsLogDir\\afsd.log afsd_%05d.log", WorkingDirectory, Count) >= sizeof(command)) {
fprintf(stderr, "Command string exceeds maximum length: %s..\n", command);
exit(1);
}
printf("%s\n\n", command);
rc = system(command);
++Count;
@ -142,8 +179,7 @@ int main(int argc, char* argv[])
rc = GetConsoleInput(hStdin);
}
sprintf(command, "fs trace -off");
rc = system(command);
rc = system("fs trace -off");
return(0);
}

4
src/WINNT/tests/torture/DumpAfsLog/NTMakefile
View File

@ -20,9 +20,11 @@ idirs:
EXEDIR = $(DESTDIR)\bin
EXELIBS = $(DESTDIR)\lib\afsroken.lib
OBJS = $(OUT)\DumpAfsLog.obj
$(EXEDIR)\DumpAfsLog.exe: $(OBJS)
$(EXEDIR)\DumpAfsLog.exe: $(OBJS) $(EXELIBS)
$(EXECONLINK)
$(_VC_MANIFEST_EMBED_EXE)
$(EXEPREP)