lkml.org 
[lkml]   [2003]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subjectpatch 2.4.21 better static buffer check
Date
From
hi list,
writing via sprintf() into static buffers is only asking
for trouble, IMHO. Therefor I changed do_mount.c to use
snprintf() instead of sprintf().

regards,
walter

--- init/do_mounts.c.org 2003-06-24 22:05:02.000000000 +0200
+++ init/do_mounts.c 2003-06-24 22:25:03.000000000 +0200
@@ -421,7 +421,7 @@
int fd;
va_list args;
va_start(args, fmt);
- vsprintf(buf, fmt, args);
+ vsnprintf(buf,sizeof(buf),fmt, args);
va_end(args);
fd = open("/dev/root", O_RDWR | O_NDELAY, 0);
if (fd >= 0) {
@@ -710,16 +710,16 @@
return;
lun = simple_strtol(p, &p, 10);
if (!part)
- sprintf(dest, "%s/host%d/bus%d/target%d/lun%d",
+ snprintf(dest,sizeof(dest), "%s/host%d/bus%d/target%d/lun%d",
prefix, host, bus, target, lun);
else if (*p++ == 'p')
- sprintf(dest, "%s/host%d/bus%d/target%d/lun%d/part%s",
+ snprintf(dest,sizeof(dest), "%s/host%d/bus%d/target%d/lun%d/part%s",
prefix, host, bus, target, lun, p);
else
- sprintf(dest, "%s/host%d/bus%d/target%d/lun%d/disc",
+ snprintf(dest,sizeof(dest), "%s/host%d/bus%d/target%d/lun%d/disc",
prefix, host, bus, target, lun);
*base = '\0';
- sprintf(src, "/dev/%s", name);
+ snprintf(src,sizeof(src), "/dev/%s", name);
sys_mkdir(src, 0755);
*base = '/';
sprintf(src, "/dev/%s", name);
@@ -801,7 +801,8 @@
#ifdef CONFIG_BLK_DEV_INITRD
int ram0 = kdev_t_to_nr(MKDEV(RAMDISK_MAJOR,0));
int error;
- int i, pid;
+ int i;
+ pid_t pid;

create_dev("/dev/root.old", ram0, NULL);
/* mount initrd on rootfs' /root */
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:36    [W:0.025 / U:0.096 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site