picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

floppy: fix array bounds check and minor calculation

Browse source 
Fix off-by-4 bug in floppy minors for fd[4-7].
Avoid segmentation fault for bad CMOS type.
Print mode in human readable, i.e., octal form.
This commit is contained in:
Peter Breitenlohner 2008-11-23 17:22:32 +01:00 committed by Kay Sievers
parent 6733f60178
commit 013332b93c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
extras/floppy/create_floppy_devices.c
View file

@ -130,14 +130,14 @@ int main(int argc, char **argv)
return 1;
}
if (fdnum > 3)
fdnum += 128;
fdnum += 124;
if (major < 1) {
fprintf(stderr,"Invalid major number %d\n", major);
return 1;
}
if (type < 0 || type > (int) sizeof(table)) {
if (type < 0 || type >= (int) (sizeof(table_sup) / sizeof(table_sup[0]))) {
fprintf(stderr,"Invalid CMOS type %d\n", type);
return 1;
}
@ -150,7 +150,7 @@ int main(int argc, char **argv)
sprintf(node, "%s%s", dev, table[table_sup[type][i]]);
minor = (table_sup[type][i] << 2) + fdnum;
if (print_nodes)
printf("%s b %d %d %d\n", node, mode, major, minor);
printf("%s b %.4o %d %d\n", node, mode, major, minor);
if (create_nodes) {
unlink(node);
udev_selinux_setfscreatecon(udev, node, S_IFBLK | mode);