ExternalVendorCode/conserver
1
0
Fork 0
mirror of https://github.com/bstansell/conserver.git synced 2025-03-28 22:48:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated conserver/cutil.c and conserver/group.c to use snprintf( ) vice sprintf( ) to prevent buffer overflows.

Browse Source 
Signed-off-by: Anthony Gialluca <agialluc@redhat.com>
This commit is contained in:
Anthony Gialluca 2023-09-26 14:27:42 -04:00
parent b7aa0508f0
commit 21c5e998e1
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
conserver/cutil.c
View File

@ -618,19 +618,19 @@ FileOpenFD(int fd, enum consFileType type)
#if DEBUG_CONSFILE_IO #if DEBUG_CONSFILE_IO
{ {
char buf[1024]; char buf[1024];
sprintf(buf, "CONSFILE-%s-%lu-%d.w", progname, snprintf(buf, 1024, "CONSFILE-%s-%lu-%d.w", progname,
(unsigned long)thepid, fd); (unsigned long)thepid, fd);
if ((cfp->debugwfd = if ((cfp->debugwfd =
open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) { open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) {
sprintf(buf, "[---- STARTED - %s ----]\n", snprintf(buf, 1024, "[---- STARTED - %s ----]\n",
StrTime((time_t *)0)); StrTime((time_t *)0));
write(cfp->debugwfd, buf, strlen(buf)); write(cfp->debugwfd, buf, strlen(buf));
} }
sprintf(buf, "CONSFILE-%s-%lu-%d.r", progname, snprintf(buf, 1024, "CONSFILE-%s-%lu-%d.r", progname,
(unsigned long)thepid, fd); (unsigned long)thepid, fd);
if ((cfp->debugrfd = if ((cfp->debugrfd =
open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) { open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) {
sprintf(buf, "[---- STARTED - %s ----]\n", snprintf(buf, 1024, "[---- STARTED - %s ----]\n",
StrTime((time_t *)0)); StrTime((time_t *)0));
write(cfp->debugrfd, buf, strlen(buf)); write(cfp->debugrfd, buf, strlen(buf));
} }
@ -663,19 +663,19 @@ FileOpenPipe(int fd, int fdout)
#if DEBUG_CONSFILE_IO #if DEBUG_CONSFILE_IO
{ {
char buf[1024]; char buf[1024];
sprintf(buf, "CONSFILE-%s-%lu-%d.w", progname, snprintf(buf, 1024, "CONSFILE-%s-%lu-%d.w", progname,
(unsigned long)thepid, fdout); (unsigned long)thepid, fdout);
if ((cfp->debugwfd = if ((cfp->debugwfd =
open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) { open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) {
sprintf(buf, "[---- STARTED - %s ----]\n", snprintf(buf, 1024, "[---- STARTED - %s ----]\n",
StrTime((time_t *)0)); StrTime((time_t *)0));
write(cfp->debugwfd, buf, strlen(buf)); write(cfp->debugwfd, buf, strlen(buf));
} }
sprintf(buf, "CONSFILE-%s-%lu-%d.r", progname, snprintf(buf, 1024, "CONSFILE-%s-%lu-%d.r", progname,
(unsigned long)thepid, fd); (unsigned long)thepid, fd);
if ((cfp->debugrfd = if ((cfp->debugrfd =
open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) { open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) {
sprintf(buf, "[---- STARTED - %s ----]\n", snprintf(buf, 1024, "[---- STARTED - %s ----]\n",
StrTime((time_t *)0)); StrTime((time_t *)0));
write(cfp->debugrfd, buf, strlen(buf)); write(cfp->debugrfd, buf, strlen(buf));
} }
@ -754,19 +754,19 @@ FileOpen(const char *path, int flag, int mode)
#if DEBUG_CONSFILE_IO #if DEBUG_CONSFILE_IO
{ {
char buf[1024]; char buf[1024];
sprintf(buf, "CONSFILE-%s-%lu-%d.w", progname, snprintf(buf, 1024, "CONSFILE-%s-%lu-%d.w", progname,
(unsigned long)thepid, fd); (unsigned long)thepid, fd);
if ((cfp->debugwfd = if ((cfp->debugwfd =
open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) { open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) {
sprintf(buf, "[---- STARTED - %s ----]\n", snprintf(buf, 1024, "[---- STARTED - %s ----]\n",
StrTime((time_t *)0)); StrTime((time_t *)0));
write(cfp->debugwfd, buf, strlen(buf)); write(cfp->debugwfd, buf, strlen(buf));
} }
sprintf(buf, "CONSFILE-%s-%lu-%d.r", progname, snprintf(buf, 1024, "CONSFILE-%s-%lu-%d.r", progname,
(unsigned long)thepid, fd); (unsigned long)thepid, fd);
if ((cfp->debugrfd = if ((cfp->debugrfd =
open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) { open(buf, O_WRONLY | O_CREAT | O_APPEND, 0644)) != -1) {
sprintf(buf, "[---- STARTED - %s ----]\n", snprintf(buf, 1024, "[---- STARTED - %s ----]\n",
StrTime((time_t *)0)); StrTime((time_t *)0));
write(cfp->debugrfd, buf, strlen(buf)); write(cfp->debugrfd, buf, strlen(buf));
} }

2
conserver/group.c
View File

@ -2560,7 +2560,7 @@ TelOpt(int o)
if (o < sizeof(telopts) / sizeof(char *)) if (o < sizeof(telopts) / sizeof(char *))
return telopts[o]; return telopts[o];
else { else {
sprintf(opt, "%d", o); snprintf(opt, 128, "%d", o);
return opt; return opt;
} }
} }