Skip to content

fix(libkernel): fail fcntl record locks with EFAULT on an unreadable flock pointer #15081

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
Gruzzberry wants to merge 1 commit into
base: main
Choose a base branch
from
+9 −3
Open

fix(libkernel): fail fcntl record locks with EFAULT on an unreadable flock pointer #15081

Show file tree
Hide file tree
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
5 changes: 2 additions & 3 deletions core/libs/prx/libkernel/File/src/DescriptorControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,14 +413,13 @@ void SetCloseOnExec(int fd, bool value) {
}

int RecordLock(int fd, int command, std::intptr_t argument) {
if (File::IsVirtualDirectoryDescriptor(fd)) return Fail(GuestEinval);
const bool old = command <= OldSetLockWait;
const int current = old ? command + (GetLock - OldGetLock) : command;
const std::size_t size = old ? OldGuestLockSize : sizeof(GuestLock);
auto* pointer = reinterpret_cast<void*>(argument);
if (pointer == nullptr) return Fail(GuestEfault);
GuestLock lock{};
std::memcpy(&lock, pointer, size);
if (!GuestCopyIn_nid_no_patch(&lock, pointer, size)) return Fail(GuestEfault);
if (File::IsVirtualDirectoryDescriptor(fd)) return Fail(GuestEinval);
const auto kind = Classify(fd, "fcntl");
if (!kind || *kind == Kind::Pipe || *kind == Kind::Socket) return Fail(GuestEbadf);
if (*kind != Kind::File && *kind != Kind::Directory) Unsupported("fcntl", "a record lock", *kind, fd);
Expand Down
7 changes: 7 additions & 0 deletions core/libs/tests/GuestKernelFcntl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,13 @@ static void FileFlagsRoundTrip() {
Require(sceKernelFcntl(file, DuplicateCommand, -1) == SceEinval);
RequireFailure(fcntl_nid_postfix(file, 99), GuestEinval);
RequireFailure(fcntl_nid_postfix(file, GetLock, nullptr), GuestEfault);
RequireFailure(fcntl_nid_postfix(file, GetLock, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
RequireFailure(fcntl_nid_postfix(file, SetLock, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
RequireFailure(fcntl_nid_postfix(file, SetLockWait, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
RequireFailure(fcntl_nid_postfix(file, OldGetLock, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
RequireFailure(fcntl_nid_postfix(file, OldSetLock, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
RequireFailure(fcntl_nid_postfix(file, OldSetLockWait, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
RequireFailure(fcntl_nid_postfix(-1, SetLock, reinterpret_cast<void*>(std::uintptr_t{0x10})), GuestEfault);
GuestLock lock{0, 0, 0, 3, 0, 0};
Require(fcntl_nid_postfix(file, SetLock, &lock) == 0);
GuestLock probe{0, 0, 0, 1, 0, 0};
Expand Down
Loading