archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-10 00:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor improvements to sys_ss_random_number_generator

Browse source 
* Replace CELL_EABORT with exception.
* Improve error codes a bit.
* pkg_id == 1 should not return an error if root permission is present.
* Avoid passing vm pointers to native API, use temp buffer instead.
This commit is contained in:
Eladash 2020-02-20 22:10:49 +02:00 • committed by Ivan
parent 0ed87be47a
commit 0c757222cb
2 changed files with 53 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

56
rpcs3/Emu/Cell/lv2/sys_ss.cpp
View file

@ -2,6 +2,7 @@
#include "sys_ss.h" #include "sys_ss.h"
#include "sys_process.h" #include "sys_process.h"
#include "Emu/IdManager.h"
#include "Emu/Cell/PPUThread.h" #include "Emu/Cell/PPUThread.h"
@ -31,37 +32,66 @@ const HCRYPTPROV s_crypto_provider = []() -> HCRYPTPROV
#endif #endif
template<>
void fmt_class_string<sys_ss_rng_error>::format(std::string& out, u64 arg)
{
format_enum(out, arg, [](auto error)
{
switch (error)
{
STR_CASE(SYS_SS_RNG_ERROR_INVALID_PKG);
STR_CASE(SYS_SS_RNG_ERROR_ENOMEM);
STR_CASE(SYS_SS_RNG_ERROR_EAGAIN);
STR_CASE(SYS_SS_RNG_ERROR_EFAULT);
}
return unknown;
});
}
LOG_CHANNEL(sys_ss); LOG_CHANNEL(sys_ss);
error_code sys_ss_random_number_generator(u32 arg1, vm::ptr<void> buf, u64 size) error_code sys_ss_random_number_generator(u64 pkg_id, vm::ptr<void> buf, u64 size)
{ {
sys_ss.warning("sys_ss_random_number_generator(arg1=%u, buf=*0x%x, size=0x%x)", arg1, buf, size); sys_ss.warning("sys_ss_random_number_generator(pkg_id=%u, buf=*0x%x, size=0x%x)", pkg_id, buf, size);
if (arg1 != 2) if (pkg_id != 2)
{ {
return 0x80010509; if (pkg_id == 1)
{
if (!g_ps3_process_info.has_root_perm())
{
return CELL_ENOSYS;
}
sys_ss.todo("sys_ss_random_number_generator(): pkg_id=1");
std::memset(buf.get_ptr(), 0, 0x18);
return CELL_OK;
}
return SYS_SS_RNG_ERROR_INVALID_PKG;
} }
// TODO
if (size > 0x10000000) if (size > 0x10000000)
{ {
return 0x80010501; return SYS_SS_RNG_ERROR_ENOMEM;
} }
std::unique_ptr<u8[]> temp(new u8[size]);
#ifdef _WIN32 #ifdef _WIN32
if (!s_crypto_provider || !CryptGenRandom(s_crypto_provider, size, (BYTE*)buf.get_ptr())) if (!s_crypto_provider || !CryptGenRandom(s_crypto_provider, size, temp.get()))
{
return CELL_EABORT;
}
#else #else
fs::file rnd{"/dev/urandom"}; fs::file rnd{"/dev/urandom"};
if (!rnd || rnd.read(buf.get_ptr(), size) != size) if (!rnd || rnd.read(temp.get(), size) != size)
{
return CELL_EABORT;
}
#endif #endif
{
fmt::throw_exception("sys_ss_random_number_generator(): Failed to generate pseudo-random numbers" HERE);
}
std::memcpy(buf.get_ptr(), temp.get(), size);
return CELL_OK; return CELL_OK;
} }

11
rpcs3/Emu/Cell/lv2/sys_ss.h
View file

@ -3,13 +3,22 @@
#include "Emu/Memory/vm_ptr.h" #include "Emu/Memory/vm_ptr.h"
#include "Emu/Cell/ErrorCodes.h" #include "Emu/Cell/ErrorCodes.h"
// Unofficial error code names
enum sys_ss_rng_error : u32
{
SYS_SS_RNG_ERROR_INVALID_PKG = 0x80010500,
SYS_SS_RNG_ERROR_ENOMEM = 0x80010501,
SYS_SS_RNG_ERROR_EAGAIN = 0x80010503,
SYS_SS_RNG_ERROR_EFAULT = 0x80010509,
};
struct CellSsOpenPSID struct CellSsOpenPSID
{ {
be_t<u64> high; be_t<u64> high;
be_t<u64> low; be_t<u64> low;
}; };
error_code sys_ss_random_number_generator(u32 arg1, vm::ptr<void> buf, u64 size); error_code sys_ss_random_number_generator(u64 pkg_id, vm::ptr<void> buf, u64 size);
error_code sys_ss_access_control_engine(u64 pkg_id, u64 a2, u64 a3); error_code sys_ss_access_control_engine(u64 pkg_id, u64 a2, u64 a3);
s32 sys_ss_get_console_id(vm::ptr<u8> buf); s32 sys_ss_get_console_id(vm::ptr<u8> buf);
s32 sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> ptr); s32 sys_ss_get_open_psid(vm::ptr<CellSsOpenPSID> ptr);