Skip to content

Return EINVAL from getdents when the buffer is too small #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
emkey1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Return EINVAL from getdents when the buffer is too small #2774

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion fs/dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,15 @@ int_t sys_getdents_common(fd_t f, addr_t dirents, dword_t count,
printed++;
}

if (reclen > count)
if (reclen > count) {
if (count == orig_count) {
// If the buffer isn't large enough to read even a single dirent,
// reset the fd and return _EINVAL.
fd_seekdir(fd, ptr);
return _EINVAL;
}
break;
}
if (user_write(dirents, dirent_data, reclen))
return _EFAULT;
dirents += reclen;
Expand Down
Loading