upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-11 01:30:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

linux(4): Fixup miscalculation of d_off of struct dirent in getdents() syscalls.

Browse source 
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
This commit is contained in:
Dmitry Chagin 2022-03-31 20:50:09 +03:00
parent 9103c5582a
commit 099fa2feb3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sys/compat/linux/linux_file.c
View file

@ -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));