diff options
| author | Dmitry Chagin <dchagin@FreeBSD.org> | 2022-03-31 17:50:09 +0000 |
|---|---|---|
| committer | Dmitry Chagin <dchagin@FreeBSD.org> | 2022-03-31 17:50:09 +0000 |
| commit | 099fa2feb36fe6a68a87dfdb0f290b882139a88d (patch) | |
| tree | 23b028bc3654b9e2b6eda9d06577a909c7fc887f | |
| parent | 9103c5582a2d271fa8f4df136ae511da572c660f (diff) | |
| download | src-099fa2feb36fe6a68a87dfdb0f290b882139a88d.tar.gz src-099fa2feb36fe6a68a87dfdb0f290b882139a88d.zip | |
linux(4): Fixup miscalculation of d_off of struct dirent in getdents() syscalls.
Avoid calculating d_off value as it is specific to the underlying filesystem
and can be used by others API, like lseek(), seekdir() as input offset.
Differential revision: https://reviews.freebsd.org/D31551
MFC after: 2 weeks
| -rw-r--r-- | sys/compat/linux/linux_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 285faaf8927b..6a1402c09456 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -497,7 +497,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args) linux_dirent = (struct l_dirent*)lbuf; linux_dirent->d_ino = bdp->d_fileno; - linux_dirent->d_off = base + reclen; + linux_dirent->d_off = bdp->d_off; linux_dirent->d_reclen = linuxreclen; /* * Copy d_type to last byte of l_dirent buffer @@ -574,7 +574,7 @@ linux_getdents64(struct thread *td, struct linux_getdents64_args *args) linux_dirent64 = (struct l_dirent64*)lbuf; linux_dirent64->d_ino = bdp->d_fileno; - linux_dirent64->d_off = base + reclen; + linux_dirent64->d_off = bdp->d_off; linux_dirent64->d_reclen = linuxreclen; linux_dirent64->d_type = bdp->d_type; strlcpy(linux_dirent64->d_name, bdp->d_name, @@ -631,7 +631,7 @@ linux_readdir(struct thread *td, struct linux_readdir_args *args) linux_dirent = (struct l_dirent*)lbuf; linux_dirent->d_ino = bdp->d_fileno; - linux_dirent->d_off = linuxreclen; + linux_dirent->d_off = bdp->d_off; linux_dirent->d_reclen = bdp->d_namlen; strlcpy(linux_dirent->d_name, bdp->d_name, linuxreclen - offsetof(struct l_dirent, d_name)); |