mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-17 13:53:39 +00:00
- Ignore and report duplicate and empty device names in devfs_populate_loop()
instead of causing erratic behavior. Currently make_dev(9) can't fail, so there is no way to report an error to make_dev(9) callers. - Disallow using "." and ".." in device path names. It didn't work previously but now it is reported rather than panicing. - Treat multiple sequential slashes as single in device path names. Discussed with: pjd
This commit is contained in:
parent
40c46ad800
commit
70781bf94e
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=206560
|
@ -408,6 +408,9 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup)
|
|||
continue;
|
||||
KASSERT((cdp->cdp_flags & CDP_ACTIVE), ("Bogons, I tell ya'!"));
|
||||
|
||||
if (cdp->cdp_flags & CDP_INVALID)
|
||||
continue;
|
||||
|
||||
if (dm->dm_idx <= cdp->cdp_maxdirent &&
|
||||
cdp->cdp_dirents[dm->dm_idx] != NULL) {
|
||||
de = cdp->cdp_dirents[dm->dm_idx];
|
||||
|
@ -425,6 +428,8 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup)
|
|||
dd = dm->dm_rootdir;
|
||||
s = cdp->cdp_c.si_name;
|
||||
for (;;) {
|
||||
while (*s == '/')
|
||||
s++;
|
||||
for (q = s; *q != '/' && *q != '\0'; q++)
|
||||
continue;
|
||||
if (*q != '/')
|
||||
|
@ -434,6 +439,24 @@ devfs_populate_loop(struct devfs_mount *dm, int cleanup)
|
|||
de = devfs_vmkdir(dm, s, q - s, dd, 0);
|
||||
s = q + 1;
|
||||
dd = de;
|
||||
if (dd->de_flags & (DE_DOT | DE_DOTDOT))
|
||||
break;
|
||||
}
|
||||
|
||||
/*
|
||||
* XXX: Ignore duplicate and empty device names.
|
||||
* XXX: Currently there is no way to report the error to
|
||||
* XXX: the make_dev(9) caller.
|
||||
*/
|
||||
if (dd->de_dirent->d_type != DT_DIR ||
|
||||
dd->de_flags & (DE_DOT | DE_DOTDOT) || q - s < 1 ||
|
||||
devfs_find(dd, s, q - s) != NULL) {
|
||||
dev_lock();
|
||||
cdp->cdp_flags |= CDP_INVALID;
|
||||
dev_unlock();
|
||||
printf("%s: %s: invalid or duplicate device name\n",
|
||||
__func__, cdp->cdp_c.si_name);
|
||||
return (1);
|
||||
}
|
||||
|
||||
de = devfs_newdirent(s, q - s);
|
||||
|
|
|
@ -55,6 +55,7 @@ struct cdev_priv {
|
|||
u_int cdp_flags;
|
||||
#define CDP_ACTIVE (1 << 0)
|
||||
#define CDP_SCHED_DTR (1 << 1)
|
||||
#define CDP_INVALID (1 << 2)
|
||||
|
||||
u_int cdp_inuse;
|
||||
u_int cdp_maxdirent;
|
||||
|
|
Loading…
Reference in a new issue