preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-21 03:46:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keep the SHA-1 context in game memory too, and scope the Tlspl partition range to user mode

Browse Source 
sceKernelUtilsSha1Block* had the same single global context that MD5 did, so it gets the same
treatment: state, counters and block buffer now live at ctxAddr in the layout hash/sha1ctx
records off hardware. Unlike MD5, SHA-1 does not stream whole blocks through buf, which happens
to be what our sha1_update already does - so no fill-in step is needed there.

The Tlspl partition range from the last commit was too broad a cut. Hardware says only 1-6 exist,
but that recording is from user mode, and BlockAllocatorFromID deliberately maps 8 and 10 to the
user partition for a kernel-mode caller - rejecting them outright would have taken that away.
The tightened range now applies to user mode only and kernel mode keeps what it had.
threads/tls/partition also shows the answer doesn't depend on the compiled SDK version, checked
across 1.00 through 6.06, and that partition 5 is accepted - which no test had covered.
This commit is contained in:
Henrik Rydgård
2026-09-08 15:18:02 -06:00
parent 8a02d1ee0f
commit 705ea7eb02
4 changed files with 82 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Core/HLE/sceKernelMemory.cpp
+11 -4
View File
@@ -1863,10 +1863,17 @@ SceUID sceKernelCreateTlspl(const char *name, u32 partition, u32 attr, u32 block
return hleLogWarning(Log::sceKernel, SCE_KERNEL_ERROR_NO_MEMORY, "invalid name");
if ((attr & ~PSP_TLSPL_ATTR_KNOWN) >= 0x100)
return hleLogWarning(Log::sceKernel, SCE_KERNEL_ERROR_ILLEGAL_ATTR, "invalid attr parameter: %08x", attr);
// Tlspl draws the line at 6, unlike Vpl above: threads/tls/create records 7, 8, 9 and 10 all
// returning ILLEGAL_ARGUMENT on a real PSP, where threads/vpl/create has 8 and 9 falling
// through to ILLEGAL_PERM. Same-looking check, genuinely different range.
if (partition < 1 || partition > 6)
// From user mode only 1-6 exist: threads/tls/partition records 7 and up all returning
// ILLEGAL_ARGUMENT on a real PSP, where 1, 3 and 4 fall through to ILLEGAL_PERM below. Note
// this differs from sceKernelCreateVpl above, which does let 8 and 9 reach the permission
// check - the two used to share a range that was only ever right for Vpl.
//
// The kernel-mode range is left as it was, since 8 and 10 map to the user partition for a
// kernel caller and there's no hardware recording from kernel mode to check it against - a
// test PRX built on this suite's common code doesn't fit in the kernel partition alongside
// PSPLink.
const u32 highestPartition = hleIsKernelMode() ? 9 : 6;
if (partition < 1 || partition == 7 || partition > highestPartition)
return hleLogWarning(Log::sceKernel, SCE_KERNEL_ERROR_ILLEGAL_ARGUMENT, "invalid partition %d", partition);
BlockAllocator *allocator = BlockAllocatorFromID(partition);