From 274f092e70008495d19d80697e80a9506bccb6b8 Mon Sep 17 00:00:00 2001
From: pushkarreddyy <212133856+pushkarreddyy@users.noreply.github.com>
Date: Sat, 17 Oct 2026 17:30:56 +0530
Subject: [PATCH] fix(libkernel): return EFAULT from sceKernelStat and
 sceKernelUnlink for a null path

---
 core/libs/prx/libkernel/File/src/Open.cpp | 11 ++++-------
 core/libs/tests/GuestPosixScalarIo.cpp    |  6 ++++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/libs/prx/libkernel/File/src/Open.cpp b/core/libs/prx/libkernel/File/src/Open.cpp
index f3a34a761fc..1f04eda811e 100644
--- a/core/libs/prx/libkernel/File/src/Open.cpp
+++ b/core/libs/prx/libkernel/File/src/Open.cpp
@@ -316,16 +316,15 @@ std::int64_t APS5_VABI sceKernelLseek(int d, std::int64_t offset, int whence) {
     return result;
 }
 
+constexpr int GuestEfault = 14;
+
 int APS5_VABI sceKernelStat(const char* path, FileStat* sb) {
-    if (path == nullptr) {
-        throw std::invalid_argument(std::string(__func__) + ": path is null");
-    }
+    if (path == nullptr) return SceErrorFromErrno(GuestEfault);
     if (*path == '\0') return SceErrorFromErrno(2);
     std::filesystem::path native;
     if (const int error = ResolvePathError_nid_no_patch(path, native, true, true)) return SceKernelError(error);
     std::error_code error;
     constexpr int GuestEnotdir = 20;
-    constexpr int GuestEfault = 14;
     FileStat archived{};
     if (File::FillArchivedStat(native, &archived)) {
         if (std::string_view(path).back() == '/' && (archived.st_mode & 0170000) != 0040000) return SceErrorFromErrno(GuestEnotdir);
@@ -346,9 +345,7 @@ int APS5_VABI sceKernelStat(const char* path, FileStat* sb) {
 }
 
 int APS5_VABI sceKernelUnlink(const char* path) {
-    if (path == nullptr) {
-        throw std::invalid_argument(std::string(__func__) + ": path is null");
-    }
+    if (path == nullptr) return SceErrorFromErrno(GuestEfault);
     if (*path == '\0') return SceErrorFromErrno(2);
     std::filesystem::path native;
     if (const int error = ResolvePathError_nid_no_patch(path, native)) return SceKernelError(error);
diff --git a/core/libs/tests/GuestPosixScalarIo.cpp b/core/libs/tests/GuestPosixScalarIo.cpp
index a7ed4abe6aa..3cc3e35f7a8 100644
--- a/core/libs/tests/GuestPosixScalarIo.cpp
+++ b/core/libs/tests/GuestPosixScalarIo.cpp
@@ -35,6 +35,8 @@ std::int64_t APS5_VABI pwrite_nid_disambig1_nid_postfix(int, const void*, std::s
 std::int64_t APS5_VABI sceKernelRead(int, void*, std::size_t);
 std::int64_t APS5_VABI sceKernelWrite(int, const void*, std::size_t);
 std::int64_t APS5_VABI sceKernelLseek(int, std::int64_t, int);
+int APS5_VABI sceKernelStat(const char*, FileStat*);
+int APS5_VABI sceKernelUnlink(const char*);
 }
 
 static void Check(bool value, int line) {
@@ -153,6 +155,10 @@ int main() {
     Require(sceKernelWrite(descriptor, nullptr, 0) == 0);
     Require(sceKernelRead(-1, nullptr, 0) == static_cast<std::int32_t>(0x80020009u));
     Require(sceKernelWrite(-1, nullptr, 0) == static_cast<std::int32_t>(0x80020009u));
+    FileStat nullStat{};
+    Require(sceKernelStat(nullptr, &nullStat) == static_cast<std::int32_t>(0x8002000eu));
+    Require(sceKernelStat(nullptr, nullptr) == static_cast<std::int32_t>(0x8002000eu));
+    Require(sceKernelUnlink(nullptr) == static_cast<std::int32_t>(0x8002000eu));
     Require(close_nid_postfix(descriptor) == 0);
     const int readOnly = open_nid_postfix(fileName.c_str(), SCE_KERNEL_O_RDONLY, 0);
     Require(readOnly >= 0);