d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement proper bounds-checking and truncation of device names, this has

Browse Source 
become an issue now that end-user controlable attributes can become devices
names with the geom_vol_ffs class.
This commit is contained in:
Poul-Henning Kamp 2003-02-04 11:04:26 +00:00
parent 237d2765f9
commit 6334a66358
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/kern/kern_conf.c
View File

@ -270,8 +270,11 @@ make_dev(struct cdevsw *devsw, int minor, uid_t uid, gid_t gid, int perms, const
return (dev);
}
va_start(ap, fmt);
i = kvprintf(fmt, NULL, dev->si_name, 32, ap);
dev->si_name[i] = '\0';
i = vsnrprintf(dev->__si_namebuf, sizeof dev->__si_namebuf, 32, fmt, ap);
if (i > (sizeof dev->__si_namebuf - 1)) {
printf("WARNING: Device name truncated! (%s)",
dev->__si_namebuf);
}
va_end(ap);
dev->si_devsw = devsw;
dev->si_uid = uid;
@ -318,8 +321,11 @@ make_dev_alias(dev_t pdev, const char *fmt, ...)
dev->si_flags |= SI_NAMED;
dev_depends(pdev, dev);
va_start(ap, fmt);
i = kvprintf(fmt, NULL, dev->si_name, 32, ap);
dev->si_name[i] = '\0';
i = vsnrprintf(dev->__si_namebuf, sizeof dev->__si_namebuf, 32, fmt, ap);
if (i > (sizeof dev->__si_namebuf - 1)) {
printf("WARNING: Device name truncated! (%s)",
dev->__si_namebuf);
}
va_end(ap);
if (devfs_create_hook)