Skip directory entries with zero inode number during traversal.
Entries with zero inode number are considered placeholders by libc and UFS. Fix remaining uses of VOP_READDIR in kernel: vop_stdvptocnp, unionfs. Sponsored by: Google Summer of Code 2011
This commit is contained in:
parent
9e460a98e6
commit
ac13a90c4b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=235503
@ -1184,7 +1184,7 @@ unionfs_check_rmdir(struct vnode *vp, struct ucred *cred, struct thread *td)
|
||||
edp = (struct dirent*)&buf[sizeof(buf) - uio.uio_resid];
|
||||
for (dp = (struct dirent*)buf; !error && dp < edp;
|
||||
dp = (struct dirent*)((caddr_t)dp + dp->d_reclen)) {
|
||||
if (dp->d_type == DT_WHT ||
|
||||
if (dp->d_type == DT_WHT || dp->d_fileno == 0 ||
|
||||
(dp->d_namlen == 1 && dp->d_name[0] == '.') ||
|
||||
(dp->d_namlen == 2 && !bcmp(dp->d_name, "..", 2)))
|
||||
continue;
|
||||
|
@ -343,8 +343,8 @@ dirent_exists(struct vnode *vp, const char *dirname, struct thread *td)
|
||||
if (error)
|
||||
goto out;
|
||||
|
||||
if ((dp->d_type != DT_WHT) &&
|
||||
!strcmp(dp->d_name, dirname)) {
|
||||
if (dp->d_type != DT_WHT && dp->d_fileno != 0 &&
|
||||
strcmp(dp->d_name, dirname) == 0) {
|
||||
found = 1;
|
||||
goto out;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user