emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vodz' last_patch42_2, which is an updated fix for buffer overflows

Browse Source 
noted by Gerardo Puga
This commit is contained in:
Eric Andersen 2002-06-08 12:44:17 +00:00
parent 0c789a4255
commit 360060252a
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
miscutils/makedevs.c
View File

@ -17,57 +17,51 @@
int makedevs_main(int argc, char **argv) int makedevs_main(int argc, char **argv)
{ {
dev_t dev = 0; mode_t mode;
mode_t mode = 0; char *basedev, *type, *nodname, buf[255];
char *basedev, *type, devname[255], buf[255]; int major, Sminor, S, E;
int major, Sminor, S, E, sbase;
if (argc < 7 || *argv[1]=='-') if (argc < 7 || *argv[1]=='-')
show_usage(); show_usage();
basedev = argv[1]; basedev = argv[1];
type = argv[2]; type = argv[2];
major = atoi(argv[3]); major = atoi(argv[3]) << 8; /* correcting param to mknod() */
Sminor = atoi(argv[4]); Sminor = atoi(argv[4]);
S = atoi(argv[5]); S = atoi(argv[5]);
E = atoi(argv[6]); E = atoi(argv[6]);
sbase = argc == 8 ? 1 : 0; nodname = argc == 8 ? basedev : buf;
mode = 0660;
switch (type[0]) { switch (type[0]) {
case 'c': case 'c':
mode = S_IFCHR; mode |= S_IFCHR;
break; break;
case 'b': case 'b':
mode = S_IFBLK; mode |= S_IFBLK;
break; break;
case 'f': case 'f':
mode = S_IFIFO; mode |= S_IFIFO;
break; break;
default: default:
show_usage(); show_usage();
} }
mode |= 0660;
while (S <= E) { while (S <= E) {
int sz;
if (type[0] != 'f') sz = snprintf(buf, sizeof(buf), "%s%d", basedev, S);
dev = (major << 8) | Sminor; if(sz<0 || sz>=sizeof(buf)) /* libc different */
safe_strncpy(devname, basedev, sizeof(devname)); error_msg_and_die("%s too large", basedev);
if (sbase == 0) { /* if mode != S_IFCHR and != S_IFBLK third param in mknod() ignored */
int len;
len = strlen(devname);
if (S > 10000 || len > (sizeof(devname)-6))
error_msg_and_die("%s: number too large", buf);
sprintf(buf, "%d", S);
strcat(devname, buf);
} else {
sbase = 0;
}
if (mknod(devname, mode, dev)) if (mknod(nodname, mode, major | Sminor))
printf("Failed to create: %s\n", devname); error_msg("Failed to create: %s", nodname);
if (nodname == basedev) /* ex. /dev/hda - to /dev/hda1 ... */
nodname = buf;
S++; S++;
Sminor++; Sminor++;
} }