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

libc: assume no union stack if fstatfs fails in readdir

Browse Source 
The failure is not really expected, but should it happen it's better to
get some data.

Suggested by:	kib
This commit is contained in:
Mateusz Guzik 2020-01-17 14:40:09 +00:00
parent 1ad72b270c
commit 360af171b3
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=356829
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/libc/gen/opendir.c
View File

@ -283,7 +283,7 @@ __opendir_common(int fd, int flags, bool use_current_pos)
DIR *dirp;
int incr;
int saved_errno;
int unionstack;
bool unionstack;
if ((dirp = malloc(sizeof(DIR) + sizeof(struct _telldir))) == NULL)
return (NULL);
@ -310,15 +310,14 @@ __opendir_common(int fd, int flags, bool use_current_pos)
/*
* Determine whether this directory is the top of a union stack.
*/
unionstack = false;
if (flags & DTF_NODUP) {
struct statfs sfb;
if (_fstatfs(fd, &sfb) < 0)
goto fail;
unionstack = !strcmp(sfb.f_fstypename, "unionfs")
|| (sfb.f_flags & MNT_UNION);
} else {
unionstack = 0;
if (_fstatfs(fd, &sfb) == 0) {
unionstack = strcmp(sfb.f_fstypename, "unionfs") == 0 ||
(sfb.f_flags & MNT_UNION);
}
}
if (unionstack) {