Skip to content

Linux payload implementing HV exploits to run a custom bootloader

C

Added 10.XX support (#72)

soniciso134dcae6c4333
diff --git a/include/config.h b/include/config.h
index fe96f41..be6f2ed 100644
--- a/include/config.h
+++ b/include/config.h
@@ -5,7 +5,9 @@
/* Firmwares that use the 11.x Sonic carrier and hypervisor-defeat path. */
#define PS5_FW_IS_11XX(fw) \
- ((fw) == 0x1100 || (fw) == 0x1120 || (fw) == 0x1140 || (fw) == 0x1160)
+ ((fw) == 0x1000 || (fw) == 0x1001 || (fw) == 0x1020 || (fw) == 0x1040 || \
+ (fw) == 0x1060 || (fw) == 0x1100 || (fw) == 0x1120 || (fw) == 0x1140 || \
+ (fw) == 0x1160)
#define PS5_FW_IS_12XX(fw) \
((fw) == 0x1200 || (fw) == 0x1202 || (fw) == 0x1220 || (fw) == 0x1240 || \
(fw) == 0x1260 || (fw) == 0x1270)
diff --git a/include/loader_staging_1160.h b/include/loader_staging_1160.h
index 4f96bb5..67ede3f 100644
--- a/include/loader_staging_1160.h
+++ b/include/loader_staging_1160.h
@@ -18,6 +18,7 @@
int stage_linux_aliases_1160(const struct linux_info *info, void *bzimage,
size_t bzimage_mapping_size, void *initrd,
size_t initrd_mapping_size);
+int take_sx_stack_page_10xx(uint64_t copy_lo, uint64_t copy_hi);
/* stage_linux_aliases_1160 returns this instead of -1 when it refused a page
* table or the code cave inside the copy range. Those stay where they are
diff --git a/include/offsets.h b/include/offsets.h
index bba7b0e..64f720c 100644
--- a/include/offsets.h
+++ b/include/offsets.h
@@ -105,6 +105,11 @@ extern offset_list off_1100;
extern offset_list off_1120;
extern offset_list off_1140;
extern offset_list off_1160;
+extern offset_list off_1000;
+extern offset_list off_1001;
+extern offset_list off_1020;
+extern offset_list off_1040;
+extern offset_list off_1060;
extern offset_list off_1200;
extern offset_list off_1202;
extern offset_list off_1220;
diff --git a/shellcode_kernel_1160/display_ops_1160.c b/shellcode_kernel_1160/display_ops_1160.c
index 6aef6bc..54f7318 100644
--- a/shellcode_kernel_1160/display_ops_1160.c
+++ b/shellcode_kernel_1160/display_ops_1160.c
@@ -84,6 +84,60 @@ const ps5_display_op_1160 ps5_display_ops_1140[29] = {
{0x00539770, 0, 0, 0}, {0x00539610, 0, 0, 0},
};
+const ps5_display_op_1160 ps5_display_ops_1000[29] = {
+ {0x00306E50, 0, 0, 0x0}, {0x003070B0, 0, 0, 0x0}, {0x00307200, 0, 0, 0x0}, {0x003073C0, 0, 0, 0x0}, {0x00BA1B00, 0, 0, 0x0}, {0x002D7C20, 0, 0, 0x0}, {0x006EDBB0, 0, 0, 0x0}, {0x00A8E5A0, 0, 0, 0x0}, {0x004D8670, 0, 0, 0x0}, {0x004D8850, 0, 0, 0x0}, {0x003071D0, 0, 0, 0x0}, {0x00B13DB0, 0, 0, 0x0}, {0x00B14790, 0, 0, 0x0}, {0x00B149A0, 0, 0, 0x0}, {0x00B14AF0, 0, 0, 0x0}, {0x002D8C40, 0, 0, 0x0}, {0x002D8C40, 1, 0, 0x0}, {0x002D8C40, 2, 0, 0x0}, {0x002D8C40, 3, 0, 0x0}, {0x003073F0, 0, 0, 0x0}, {0x004D8A20, 0, 0, 0x0}, {0x004D8BA0, 0, 0, 0x0}, {0x00B13EA0, 0, 0, 0x0}, {0x006F4360, 0, 0, 0x0}, {0x0096B420, 1, 2, 0x7F0}, {0x004DD950, 0, 0, 0x0}, {0x004D9860, 1, 0, 0x0}, {0x004D92D0, 0, 0, 0x0}, {0x004D9170, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_1001[29] = {
+ {0x00306E50, 0, 0, 0x0}, {0x003070B0, 0, 0, 0x0}, {0x00307200, 0, 0, 0x0}, {0x003073C0, 0, 0, 0x0}, {0x00BA1B00, 0, 0, 0x0}, {0x002D7C20, 0, 0, 0x0}, {0x006EDBB0, 0, 0, 0x0}, {0x00A8E5A0, 0, 0, 0x0}, {0x004D8670, 0, 0, 0x0}, {0x004D8850, 0, 0, 0x0}, {0x003071D0, 0, 0, 0x0}, {0x00B13DB0, 0, 0, 0x0}, {0x00B14790, 0, 0, 0x0}, {0x00B149A0, 0, 0, 0x0}, {0x00B14AF0, 0, 0, 0x0}, {0x002D8C40, 0, 0, 0x0}, {0x002D8C40, 1, 0, 0x0}, {0x002D8C40, 2, 0, 0x0}, {0x002D8C40, 3, 0, 0x0}, {0x003073F0, 0, 0, 0x0}, {0x004D8A20, 0, 0, 0x0}, {0x004D8BA0, 0, 0, 0x0}, {0x00B13EA0, 0, 0, 0x0}, {0x006F4360, 0, 0, 0x0}, {0x0096B420, 1, 2, 0x7F0}, {0x004DD950, 0, 0, 0x0}, {0x004D9860, 1, 0, 0x0}, {0x004D92D0, 0, 0, 0x0}, {0x004D9170, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_1020[29] = {
+ {0x00306E50, 0, 0, 0x0}, {0x003070B0, 0, 0, 0x0}, {0x00307200, 0, 0, 0x0}, {0x003073C0, 0, 0, 0x0}, {0x00BA1DC0, 0, 0, 0x0}, {0x002D7C20, 0, 0, 0x0}, {0x006EDD30, 0, 0, 0x0}, {0x00A8E7C0, 0, 0, 0x0}, {0x004D8660, 0, 0, 0x0}, {0x004D8840, 0, 0, 0x0}, {0x003071D0, 0, 0, 0x0}, {0x00B13FD0, 0, 0, 0x0}, {0x00B149B0, 0, 0, 0x0}, {0x00B14BC0, 0, 0, 0x0}, {0x00B14D10, 0, 0, 0x0}, {0x002D8C40, 0, 0, 0x0}, {0x002D8C40, 1, 0, 0x0}, {0x002D8C40, 2, 0, 0x0}, {0x002D8C40, 3, 0, 0x0}, {0x003073F0, 0, 0, 0x0}, {0x004D8A10, 0, 0, 0x0}, {0x004D8B90, 0, 0, 0x0}, {0x00B140C0, 0, 0, 0x0}, {0x006F44E0, 0, 0, 0x0}, {0x0096B640, 1, 2, 0x7F0}, {0x004DD940, 0, 0, 0x0}, {0x004D9850, 1, 0, 0x0}, {0x004D92C0, 0, 0, 0x0}, {0x004D9160, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_1040[29] = {
+ {0x00306E50, 0, 0, 0x0}, {0x003070B0, 0, 0, 0x0}, {0x00307200, 0, 0, 0x0}, {0x003073C0, 0, 0, 0x0}, {0x00BA1DC0, 0, 0, 0x0}, {0x002D7C20, 0, 0, 0x0}, {0x006EDD30, 0, 0, 0x0}, {0x00A8E7C0, 0, 0, 0x0}, {0x004D8660, 0, 0, 0x0}, {0x004D8840, 0, 0, 0x0}, {0x003071D0, 0, 0, 0x0}, {0x00B13FD0, 0, 0, 0x0}, {0x00B149B0, 0, 0, 0x0}, {0x00B14BC0, 0, 0, 0x0}, {0x00B14D10, 0, 0, 0x0}, {0x002D8C40, 0, 0, 0x0}, {0x002D8C40, 1, 0, 0x0}, {0x002D8C40, 2, 0, 0x0}, {0x002D8C40, 3, 0, 0x0}, {0x003073F0, 0, 0, 0x0}, {0x004D8A10, 0, 0, 0x0}, {0x004D8B90, 0, 0, 0x0}, {0x00B140C0, 0, 0, 0x0}, {0x006F44E0, 0, 0, 0x0}, {0x0096B640, 1, 2, 0x7F0}, {0x004DD940, 0, 0, 0x0}, {0x004D9850, 1, 0, 0x0}, {0x004D92C0, 0, 0, 0x0}, {0x004D9160, 0, 0, 0x0}
+};
+
+#if defined(DISPLAY_89)
+const ps5_display_op_1160 ps5_display_ops_0800[29] = {
+ {0x002FA840, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x002FAD90, 0, 0, 0x0}, {0x00B536B0, 0, 0, 0x0}, {0x002CC7E0, 0, 0, 0x0}, {0x006BB1B0, 0, 0, 0x0}, {0x00A4B940, 0, 0, 0x0}, {0x004C5E60, 0, 0, 0x0}, {0x004C5E60, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AD3120, 0, 0, 0x0}, {0x00AD3320, 0, 0, 0x0}, {0x00AD3460, 0, 0, 0x0}, {0x002CF5E0, 0, 0, 0x0}, {0x002CF5E0, 1, 0, 0x0}, {0x002CF5E0, 2, 0, 0x0}, {0x002CF5E0, 3, 0, 0x0}, {0x002FADC0, 0, 0, 0x0}, {0x004C6020, 0, 0, 0x0}, {0x004C6190, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x0092B700, 1, 2, 0x7F0}, {0x004C8A00, 0, 0, 0x0}, {0x004C6C40, 1, 0, 0x0}, {0x004C6810, 0, 0, 0x0}, {0x004C6700, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0820[29] = {
+ {0x002FA840, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x002FAD90, 0, 0, 0x0}, {0x00B54B40, 0, 0, 0x0}, {0x002CC7E0, 0, 0, 0x0}, {0x006BB790, 0, 0, 0x0}, {0x00A4CD40, 0, 0, 0x0}, {0x004C6340, 0, 0, 0x0}, {0x004C6340, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AD4520, 0, 0, 0x0}, {0x00AD4720, 0, 0, 0x0}, {0x00AD4860, 0, 0, 0x0}, {0x002CF5E0, 0, 0, 0x0}, {0x002CF5E0, 1, 0, 0x0}, {0x002CF5E0, 2, 0, 0x0}, {0x002CF5E0, 3, 0, 0x0}, {0x002FADC0, 0, 0, 0x0}, {0x004C6500, 0, 0, 0x0}, {0x004C6670, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x0092CA10, 1, 2, 0x7F0}, {0x004C8EE0, 0, 0, 0x0}, {0x004C7120, 1, 0, 0x0}, {0x004C6CF0, 0, 0, 0x0}, {0x004C6BE0, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0840[29] = {
+ {0x002FBB40, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x002FC090, 0, 0, 0x0}, {0x00B54DB0, 0, 0, 0x0}, {0x002CDAE0, 0, 0, 0x0}, {0x006BCB00, 0, 0, 0x0}, {0x00A4CFD0, 0, 0, 0x0}, {0x004C76B0, 0, 0, 0x0}, {0x004C76B0, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AD47B0, 0, 0, 0x0}, {0x00AD49B0, 0, 0, 0x0}, {0x00AD4AF0, 0, 0, 0x0}, {0x002D08E0, 0, 0, 0x0}, {0x002D08E0, 1, 0, 0x0}, {0x002D08E0, 2, 0, 0x0}, {0x002D08E0, 3, 0, 0x0}, {0x002FC0C0, 0, 0, 0x0}, {0x004C7870, 0, 0, 0x0}, {0x004C79E0, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x0092CCA0, 1, 2, 0x7F0}, {0x004CA250, 0, 0, 0x0}, {0x004C8490, 1, 0, 0x0}, {0x004C8060, 0, 0, 0x0}, {0x004C7F50, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0860[29] = {
+ {0x002FBB40, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x002FC090, 0, 0, 0x0}, {0x00B55030, 0, 0, 0x0}, {0x002CDAE0, 0, 0, 0x0}, {0x006BCB70, 0, 0, 0x0}, {0x00A4D250, 0, 0, 0x0}, {0x004C76B0, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AD4A30, 0, 0, 0x0}, {0x00AD4C30, 0, 0, 0x0}, {0x00AD4D70, 0, 0, 0x0}, {0x002D08E0, 0, 0, 0x0}, {0x002D08E0, 1, 0, 0x0}, {0x002D08E0, 2, 0, 0x0}, {0x002D08E0, 3, 0, 0x0}, {0x002FC0C0, 0, 0, 0x0}, {0x004C7870, 0, 0, 0x0}, {0x004C79E0, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x0092CD30, 1, 2, 0x7F0}, {0x004CA250, 0, 0, 0x0}, {0x004C8490, 1, 0, 0x0}, {0x004C8060, 0, 0, 0x0}, {0x004C7F50, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0900[29] = {
+ {0x003017E0, 0, 0, 0x0}, {0x00301A40, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00301D60, 0, 0, 0x0}, {0x00B80C30, 0, 0, 0x0}, {0x002D2F20, 0, 0, 0x0}, {0x006D8B10, 0, 0, 0x0}, {0x00A70880, 0, 0, 0x0}, {0x004CDED0, 0, 0, 0x0}, {0x004CE0B0, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AF55F0, 0, 0, 0x0}, {0x00AF5FF0, 0, 0, 0x0}, {0x00AF6200, 0, 0, 0x0}, {0x00AF6350, 0, 0, 0x0}, {0x002D3E50, 0, 0, 0x0}, {0x002D3E50, 1, 0, 0x0}, {0x002D3E50, 2, 0, 0x0}, {0x002D3E50, 3, 0, 0x0}, {0x00301D90, 0, 0, 0x0}, {0x004CE280, 0, 0, 0x0}, {0x004CE400, 0, 0, 0x0}, {0x00AF56E0, 0, 0, 0x0}, {0x006DF0D0, 0, 0, 0x0}, {0x0094DCE0, 1, 2, 0x7F0}, {0x004D30C0, 0, 0, 0x0}, {0x004CF0F0, 1, 0, 0x0}, {0x004CEB50, 0, 0, 0x0}, {0x004CE9F0, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0920[29] = {
+ {0x003017D0, 0, 0, 0x0}, {0x00301A30, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00301D50, 0, 0, 0x0}, {0x00B80C70, 0, 0, 0x0}, {0x002D2F10, 0, 0, 0x0}, {0x006D84A0, 0, 0, 0x0}, {0x00A708A0, 0, 0, 0x0}, {0x004CDB90, 0, 0, 0x0}, {0x004CDD70, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AF5610, 0, 0, 0x0}, {0x00AF6010, 0, 0, 0x0}, {0x00AF6220, 0, 0, 0x0}, {0x00AF6370, 0, 0, 0x0}, {0x002D3E40, 0, 0, 0x0}, {0x002D3E40, 1, 0, 0x0}, {0x002D3E40, 2, 0, 0x0}, {0x002D3E40, 3, 0, 0x0}, {0x00301D80, 0, 0, 0x0}, {0x004CDF40, 0, 0, 0x0}, {0x004CE0C0, 0, 0, 0x0}, {0x00AF5700, 0, 0, 0x0}, {0x006DEA60, 0, 0, 0x0}, {0x0094E150, 1, 2, 0x7F0}, {0x004D2D80, 0, 0, 0x0}, {0x004CEDB0, 1, 0, 0x0}, {0x004CE810, 0, 0, 0x0}, {0x004CE6B0, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0940[29] = {
+ {0x003018B0, 0, 0, 0x0}, {0x00301B10, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00301E30, 0, 0, 0x0}, {0x00B811E0, 0, 0, 0x0}, {0x002D2F10, 0, 0, 0x0}, {0x006D8980, 0, 0, 0x0}, {0x00A70E10, 0, 0, 0x0}, {0x004CDD20, 0, 0, 0x0}, {0x004CDF00, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AF5B80, 0, 0, 0x0}, {0x00AF6580, 0, 0, 0x0}, {0x00AF6790, 0, 0, 0x0}, {0x00AF68E0, 0, 0, 0x0}, {0x002D3F00, 0, 0, 0x0}, {0x002D3F00, 1, 0, 0x0}, {0x002D3F00, 2, 0, 0x0}, {0x002D3F00, 3, 0, 0x0}, {0x00301E60, 0, 0, 0x0}, {0x004CE0D0, 0, 0, 0x0}, {0x004CE250, 0, 0, 0x0}, {0x00AF5C70, 0, 0, 0x0}, {0x006DEF40, 0, 0, 0x0}, {0x0094E6C0, 1, 2, 0x7F0}, {0x004D30C0, 0, 0, 0x0}, {0x004CEF40, 1, 0, 0x0}, {0x004CE9A0, 0, 0, 0x0}, {0x004CE840, 0, 0, 0x0}
+};
+
+const ps5_display_op_1160 ps5_display_ops_0960[29] = {
+ {0x003018B0, 0, 0, 0x0}, {0x00301B10, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00301E30, 0, 0, 0x0}, {0x00B813C0, 0, 0, 0x0}, {0x002D2F10, 0, 0, 0x0}, {0x006D8A90, 0, 0, 0x0}, {0x00A70FF0, 0, 0, 0x0}, {0x004CDE20, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00000000, 0, 0, 0x0}, {0x00AF5D60, 0, 0, 0x0}, {0x00AF6760, 0, 0, 0x0}, {0x00AF6970, 0, 0, 0x0}, {0x00AF6AC0, 0, 0, 0x0}, {0x002D3F00, 0, 0, 0x0}, {0x002D3F00, 1, 0, 0x0}, {0x002D3F00, 2, 0, 0x0}, {0x002D3F00, 3, 0, 0x0}, {0x00301E60, 0, 0, 0x0}, {0x004CE1D0, 0, 0, 0x0}, {0x004CE350, 0, 0, 0x0}, {0x00AF5E50, 0, 0, 0x0}, {0x006DF050, 0, 0, 0x0}, {0x0094E8A0, 1, 2, 0x7F0}, {0x004D31C0, 0, 0, 0x0}, {0x004CF040, 1, 0, 0x0}, {0x004CEAA0, 0, 0, 0x0}, {0x004CE940, 0, 0, 0x0}
+};
+#endif
+
+const ps5_display_op_1160 ps5_display_ops_1060[29] = {
+ {0x00308050, 0, 0, 0x0}, {0x003082B0, 0, 0, 0x0}, {0x00308400, 0, 0, 0x0}, {0x003085C0, 0, 0, 0x0}, {0x00BA1DA0, 0, 0, 0x0}, {0x002D8E20, 0, 0, 0x0}, {0x006EEF30, 0, 0, 0x0}, {0x00A8E7A0, 0, 0, 0x0}, {0x004D9860, 0, 0, 0x0}, {0x004D9A40, 0, 0, 0x0}, {0x003083D0, 0, 0, 0x0}, {0x00B13FB0, 0, 0, 0x0}, {0x00B14990, 0, 0, 0x0}, {0x00B14BA0, 0, 0, 0x0}, {0x00B14CF0, 0, 0, 0x0}, {0x002D9E40, 0, 0, 0x0}, {0x002D9E40, 1, 0, 0x0}, {0x002D9E40, 2, 0, 0x0}, {0x002D9E40, 3, 0, 0x0}, {0x003085F0, 0, 0, 0x0}, {0x004D9C10, 0, 0, 0x0}, {0x004D9D90, 0, 0, 0x0}, {0x00B140A0, 0, 0, 0x0}, {0x006F56E0, 0, 0, 0x0}, {0x0096C840, 1, 2, 0x7F0}, {0x004DEB40, 0, 0, 0x0}, {0x004DAA50, 1, 0, 0x0}, {0x004DA4C0, 0, 0, 0x0}, {0x004DA360, 0, 0, 0x0}
+};
+
typedef uint64_t (*display_op1_fn)(uint32_t);
typedef uint64_t (*display_op2_fn)(uint32_t, uint64_t);
@@ -98,6 +152,11 @@ dispatch_ps5_display_op_1160(uint32_t index) {
case 0x1100: op = &ps5_display_ops_1100[index]; break;
case 0x1120: op = &ps5_display_ops_1120[index]; break;
case 0x1140: op = &ps5_display_ops_1140[index]; break;
+ case 0x1000: op = &ps5_display_ops_1000[index]; break;
+ case 0x1001: op = &ps5_display_ops_1001[index]; break;
+ case 0x1020: op = &ps5_display_ops_1020[index]; break;
+ case 0x1040: op = &ps5_display_ops_1040[index]; break;
+ case 0x1060: op = &ps5_display_ops_1060[index]; break;
default: op = &ps5_display_ops_1160[index]; break;
}
const uintptr_t target = args.ktext + op->ktext_offset;
diff --git a/source/hv_defeat_1160.c b/source/hv_defeat_1160.c
index 16fb65b..aa46894 100644
--- a/source/hv_defeat_1160.c
+++ b/source/hv_defeat_1160.c
@@ -27,6 +27,11 @@
#define FW_1100_RAW 0x11000043U
#define FW_1120_RAW 0x11200005U
#define FW_1140_RAW 0x11400005U
+#define FW_1000_RAW 0x10000046U
+#define FW_1001_RAW 0x10010000U
+#define FW_1020_RAW 0x10200006U
+#define FW_1040_RAW 0x10400007U
+#define FW_1060_RAW 0x10600006U
#define FW_1160_RAW 0x11600005U
#define NCPU 16
#define TSS_STRIDE 0x68ULL
@@ -126,17 +131,31 @@ static int offsets_present(void) {
case 0x1100: expected_raw = FW_1100_RAW; break;
case 0x1120: expected_raw = FW_1120_RAW; break;
case 0x1140: expected_raw = FW_1140_RAW; break;
+ case 0x1000: expected_raw = FW_1000_RAW; break;
+ case 0x1001: expected_raw = FW_1001_RAW; break;
+ case 0x1020: expected_raw = FW_1020_RAW; break;
+ case 0x1040: expected_raw = FW_1040_RAW; break;
+ case 0x1060: expected_raw = FW_1060_RAW; break;
case 0x1160: expected_raw = FW_1160_RAW; break;
default: return 0;
}
if (kernel_get_fw_version() != expected_raw)
return 0;
- /* Every 11.x build shares the same hypervisor image and CC cave. */
- if (env_offset.HV_CODE_CAVE_PA != 0x62806F00ULL ||
- env_offset.HV_HANDLE_VMEXIT_PA != 0x62847551ULL)
+ /* Every 10.x/11.x build shares the same hypervisor image and CC cave. */
+ if (env_offset.HV_CODE_CAVE_PA != 0x62806F00ULL)
return 0;
- if (env_offset.KERNEL_CODE_CAVE != 0xD2B000ULL ||
- env_offset.DATA_CAVE != 0x2D02000ULL)
+ if (fw >= 0x1000 && fw < 0x1050) {
+ if (env_offset.HV_HANDLE_VMEXIT_PA != 0x62847488ULL)
+ return 0;
+ } else if (fw == 0x1060) {
+ if (env_offset.HV_HANDLE_VMEXIT_PA != 0x628474A8ULL)
+ return 0;
+ } else if (env_offset.HV_HANDLE_VMEXIT_PA != 0x62847551ULL) {
+ return 0;
+ }
+ if (fw >= 0x1100 &&
+ (env_offset.KERNEL_CODE_CAVE != 0xD2B000ULL ||
+ env_offset.DATA_CAVE != 0x2D02000ULL))
return 0;
for (size_t i = 0; i < sizeof(required) / sizeof(required[0]); i++)
if (required[i] == 0)
@@ -213,14 +232,15 @@ static void gate_encode(uint64_t target, uint16_t selector, uint8_t ist,
*hi = (target >> 32) & 0xffffffffULL;
}
-static int verify_tss_layout(uint64_t tss_base, uint64_t saved[NCPU]) {
+static int verify_tss_layout(uint64_t tss_base, uint64_t saved[NCPU],
+ int db_ist) {
uint64_t rsp0[NCPU];
uint64_t ist4[NCPU];
for (int cpu = 0; cpu < NCPU; cpu++) {
uint64_t base = tss_base + (uint64_t)cpu * TSS_STRIDE;
rsp0[cpu] = kread64(base + 0x04);
- ist4[cpu] = kread64(base + TSS_IST(4));
+ ist4[cpu] = kread64(base + TSS_IST(db_ist));
saved[cpu] = kread64(tss_ist_slot(tss_base, cpu, 6));
if ((rsp0[cpu] >> 47) != 0x1ffffULL || ist4[cpu] == 0 || saved[cpu] != 0)
return -1;
@@ -431,9 +451,18 @@ static int arm_startup_carrier(uint64_t resume_cave) {
if (break_hv_bin_len == 0 || break_hv_bin_len > sizeof(staged) ||
kread64(resume_cave + CAVE_SAVE_OFF + SAVE_STATE) != 0)
return -1;
- if (!((saved_gate_lo >> 47) & 1) || ((saved_gate_lo >> 32) & 7) != 4 ||
- verify_tss_layout(tss_base, saved_ist))
- return -2;
+ {
+ int gate_p = (int)((saved_gate_lo >> 47) & 1);
+ int gate_ist = (int)((saved_gate_lo >> 32) & 7);
+ int tss_rc = (gate_p && gate_ist >= 1 && gate_ist <= 7)
+ ? verify_tss_layout(tss_base, saved_ist, gate_ist)
+ : -1;
+ if (!gate_p || gate_ist < 1 || gate_ist > 7 || tss_rc) {
+ notify("%04x arm gate: lo=0x%llx P=%d ist=%d tss=%d\n", fw,
+ (unsigned long long)saved_gate_lo, gate_p, gate_ist, tss_rc);
+ return -2;
+ }
+ }
gate_encode(kg(env_offset.GAD_PIVOT_ADD_RSP28_RET),
(uint16_t)(saved_gate_lo >> 16), 6, &gate_lo, &gate_hi);
@@ -498,12 +527,12 @@ static int arm_startup_carrier(uint64_t resume_cave) {
STACK_TOP_OFF;
if (kread64(tss_ist_slot(tss_base, cpu, 6)) != want) {
if (restore_ists(tss_base, saved_ist)) {
- notify("11.60 IST6 rollback readback failed; cold reboot required\n");
+ notify("%04x IST6 rollback readback failed; cold reboot required\n", fw);
return -10;
}
kwrite64(resume_cave + CAVE_SAVE_OFF + SAVE_STATE, 0);
if (kread64(resume_cave + CAVE_SAVE_OFF + SAVE_STATE) != 0) {
- notify("11.60 carrier-state rollback failed; cold reboot required\n");
+ notify("%04x carrier-state rollback failed; cold reboot required\n", fw);
return -10;
}
return -9;
@@ -554,28 +583,35 @@ int hv_defeat_1160(void *shellcode_kernel, size_t shellcode_kernel_len) {
int rc;
if (shellcode_kernel == NULL || !offsets_present()) {
- notify("11.60 offsets/raw firmware gate failed; refusing to arm\n");
+ notify("%04x offsets/raw firmware gate failed; refusing to arm\n", fw);
+ notify("gate diag: raw=0x%08x handler_pa=0x%llx cave_pa=0x%llx "
+ "code_cave=0x%llx data_cave=0x%llx\n",
+ (unsigned)kernel_get_fw_version(),
+ (unsigned long long)env_offset.HV_HANDLE_VMEXIT_PA,
+ (unsigned long long)env_offset.HV_CODE_CAVE_PA,
+ (unsigned long long)env_offset.KERNEL_CODE_CAVE,
+ (unsigned long long)env_offset.DATA_CAVE);
return -1;
}
if (validate_wake_cave(shellcode_kernel_len)) {
- notify("11.60 wake blob/cave mapping validation failed\n");
+ notify("%04x wake blob/cave mapping validation failed\n", fw);
return -1;
}
facs = kread64(kg(env_offset.ACPIGBL_FACS));
if ((facs >> 48) != 0xffffULL) {
- notify("11.60 AcpiGbl_FACS validation failed; refusing to arm\n");
+ notify("%04x AcpiGbl_FACS validation failed; refusing to arm\n", fw);
return -1;
}
kernel_set_ucred_authid(getpid(), 0x4800000000000007ULL);
if (pin_to_tss0() || sceKernelGetCurrentCpu() != 15) {
- notify("11.60 could not pin scheduler CPU 15 / TSS slot zero\n");
+ notify("%04x could not pin scheduler CPU 15 / TSS slot zero\n", fw);
return -1;
}
if (walk_page(dmap + AP_PAYLOAD_PAGE, 1)) {
- notify("11.60 startup-AP carrier page is not executable\n");
+ notify("%04x startup-AP carrier page is not executable\n", fw);
return -1;
}
@@ -588,7 +624,7 @@ int hv_defeat_1160(void *shellcode_kernel, size_t shellcode_kernel_len) {
resume_cave = kg(env_offset.DATA_CAVE);
if (kread64(resume_cave + CAVE_SAVE_OFF + SAVE_STATE) != 0) {
- notify("11.60 resume carrier has stale state; cold reboot required\n");
+ notify("%04x resume carrier has stale state; cold reboot required\n", fw);
return -1;
}
kwrite(resume_cave + CAVE_ORACLE_OFF, zeroes, sizeof(zeroes));
@@ -596,7 +632,7 @@ int hv_defeat_1160(void *shellcode_kernel, size_t shellcode_kernel_len) {
rc = arm_startup_carrier(resume_cave);
if (rc) {
- notify("11.60 startup-AP carrier refused to arm (%d)\n", rc);
+ notify("%04x startup-AP carrier refused to arm (%d)\n", fw, rc);
return -1;
}
diff --git a/source/loader.c b/source/loader.c
index af888a6..b34c16e 100644
--- a/source/loader.c
+++ b/source/loader.c
@@ -204,7 +204,7 @@ int fetch_linux(struct linux_info *info) {
info->kit_type = (int)get_kit_type();
strcpy(info->cmdline, cmdline);
- if (PS5_FW_IS_11XX(fw)) {
+ if (PS5_FW_IS_11XX(fw) && !(fw >= 0x1000 && fw < 0x1100)) {
// 11.60 stages the aliases with a checked, journaled transaction instead
// of the install_page_syscore loop below.
int staged = stage_linux_aliases_1160(
@@ -238,5 +238,17 @@ int fetch_linux(struct linux_info *info) {
0);
}
+ /* 10.x stages exactly like 13.x; it only needs the #SX stack page that the
+ * 11.60 transaction used to take. */
+ if (fw >= 0x1000 && fw < 0x1100) {
+ uint64_t copy_lo = cave_bzImage;
+ uint64_t copy_hi = cave_bzImage +
+ ALIGN_UP((uint64_t)bzimage_size, PAGE_SIZE) +
+ ALIGN_UP((uint64_t)initrd_size, PAGE_SIZE);
+ if (take_sx_stack_page_10xx(copy_lo, copy_hi)) {
+ notify("%04x could not take the #SX stack page\n", fw);
+ return -1;
+ }
+ }
return 0;
}
diff --git a/source/loader_staging_1160.c b/source/loader_staging_1160.c
index 7fa5431..66d5d88 100644
--- a/source/loader_staging_1160.c
+++ b/source/loader_staging_1160.c
@@ -627,6 +627,53 @@ static int take_sx_stack_page_1160(const struct alias_tx_1160 *tx,
* present, the DMAP tables for the copy and the code cave with the tables that
* map it.
*/
+/* 10.x takes the #SX stack page without the 11.60 alias transaction. A batch
+ * whose PAs do not resolve is kept mapped and the next round retried; the pair
+ * must not overlap the fixed destination the shared wake blob copies into. */
+int take_sx_stack_page_10xx(uint64_t copy_lo, uint64_t copy_hi) {
+ uint8_t *batch;
+ uint64_t pas[SX_STACK_BATCH_1160];
+ uint64_t pa = 0;
+ int round;
+
+ for (round = 0; round < SX_STACK_ROUNDS_1160; round++) {
+ int zero = 0, pairs = 0;
+ batch = mmap(NULL, SX_STACK_BATCH_1160 * PAGE_SIZE,
+ PROT_READ | PROT_WRITE, MAP_SHARED | MAP_ANONYMOUS, -1, 0);
+ if (batch == MAP_FAILED) {
+ notify("%04x sx: mmap failed round %d\n", fw, round);
+ return -1;
+ }
+ memset(batch, 0, SX_STACK_BATCH_1160 * PAGE_SIZE);
+ for (size_t i = 0; i < SX_STACK_BATCH_1160; i++) {
+ pas[i] = vtophys_user((uintptr_t)batch + i * PAGE_SIZE);
+ if (!pas[i])
+ zero++;
+ }
+ printf("%04x sx r%d first=0x%llx zero=%d\n", fw, round,
+ (unsigned long long)pas[0], zero);
+ if (zero)
+ continue;
+ if (!find_sx_stack_pair_1160(pas, SX_STACK_BATCH_1160, &pa)) {
+ uint64_t under = pa - PAGE_SIZE;
+ int hit = (pa + PAGE_SIZE > copy_lo && pa < copy_hi) ||
+ (under + PAGE_SIZE > copy_lo && under < copy_hi);
+ pairs = 1;
+ if (!hit) {
+ sx_stack_pa_1160 = pa;
+ notify("%04x sx: page 0x%llx under 0x%llx (round %d)\n", fw,
+ (unsigned long long)pa, (unsigned long long)under, round);
+ return 0;
+ }
+ }
+ printf("%04x sx r%d pairs=%d rejected=%d\n", fw, round, pairs,
+ pairs ? 1 : 0);
+ }
+ notify("%04x sx: no usable pair in %d rounds\n", fw,
+ (int)SX_STACK_ROUNDS_1160);
+ return -1;
+}
+
static int preflight_wake_copy_1160(const struct alias_tx_1160 *tx,
const struct alias_page_1160 *pages,
size_t page_count) {
diff --git a/source/offsets.c b/source/offsets.c
index 45d5a4a..c745e5c 100644
--- a/source/offsets.c
+++ b/source/offsets.c
@@ -945,6 +945,225 @@ offset_list off_1160 = {
.HV_EFI_MAP_ROOT = 0x3DCD0C8,
};
+offset_list off_1000 = {
+ .VMSPACE_VM_VMID = 0x1E4,
+ .VMSPACE_VM_PMAP = 0x1D8,
+ .ACPIGBL_FACS = 0x38491E0,
+ .IDT = 0x3A1C300,
+ .COMMON_TSS = 0x3A1EFE0,
+ .FUN_MEMCPY = 0x28D100,
+ .GAD_ADD_RSP_28_POP_RBP_RET = 0x9E3B64,
+ .GAD_IRETQ = 0x2514ED,
+ .GAD_POP_RAX_RET = 0x20C910,
+ .GAD_POP_RDI_RET = 0x1EFCB8,
+ .GAD_POP_RSI_RET = 0x1B07F0,
+ .GAD_POP_RDX_RET = 0x5008C8,
+ .GAD_POP_RCX_RET = 0x2DDC81,
+ .GAD_POP_RSP_RET = 0x254350,
+ .KERNEL_CODE_CAVE = 0xCB4000,
+ .FUN_PRINTF = 0x4D5F60,
+ .FUN_SMP_RENDEZVOUS = 0xAFF860,
+ .FUN_SMP_NO_RENDEVOUS_BARRIER = 0x20C911,
+ .HV_CODE_CAVE_PA = 0x62806F00,
+ .HV_HANDLE_VMEXIT_PA = 0x62847488,
+ .KERNEL_CFI_CHECK = 0x48CF10,
+ .G_VBIOS = 0x3C33A40,
+ .FUN_TRANSMITTER_CONTROL = 0xC0A710,
+ .FUN_MP3_INITIALIZE = 0xA14520,
+ .FUN_MP3_INVOKE = 0xA13150,
+ .HV_MP_STARTUP_CALL = 0xC12D30,
+ .MP_STARTUP_INIT_VECTOR = 0x2AFA28,
+ .DATA_CAVE = 0x2AE3000,
+ .GAD_PIVOT_ADD_RSP28_RET = 0x24619E,
+ .GAD_STORE_RDI8_RCX_RET = 0x36E9CB,
+ .GAD_SET_DR7_RET = 0xA07D86,
+ .GAD_STORE_RCX_RAX_RET = 0x3067AF,
+ .GAD_MOV_RAX_RDI_RET = 0x257DD1,
+ .GAD_REP_MOVSB_RET = 0x2A9627,
+ .GAD_CLD_RET = 0x32D338,
+ .GAD_RET_TRAMP = 0x20C911,
+ .GAD_DBREG_RESUME = 0x24AA38,
+ .PS5_WIFI_FW_OFFSET = 0x1508E40,
+ .PS5_WIFI_FW_SIZE = 0x799BC,
+ .HV_EFI_MAP_ROOT = 0x3C490B8,
+};
+
+offset_list off_1001 = {
+ .VMSPACE_VM_VMID = 0x1E4,
+ .VMSPACE_VM_PMAP = 0x1D8,
+ .ACPIGBL_FACS = 0x38491E0,
+ .IDT = 0x3A1C300,
+ .COMMON_TSS = 0x3A1EFE0,
+ .FUN_MEMCPY = 0x28D100,
+ .GAD_ADD_RSP_28_POP_RBP_RET = 0x9E3B64,
+ .GAD_IRETQ = 0x2514ED,
+ .GAD_POP_RAX_RET = 0x20C910,
+ .GAD_POP_RDI_RET = 0x1EFCB8,
+ .GAD_POP_RSI_RET = 0x1B07F0,
+ .GAD_POP_RDX_RET = 0x427E69,
+ .GAD_POP_RCX_RET = 0x2DDC81,
+ .GAD_POP_RSP_RET = 0x254350,
+ .KERNEL_CODE_CAVE = 0xCB4000,
+ .FUN_PRINTF = 0x4D5F60,
+ .FUN_SMP_RENDEZVOUS = 0xAFF860,
+ .FUN_SMP_NO_RENDEVOUS_BARRIER = 0x20C911,
+ .HV_CODE_CAVE_PA = 0x62806F00,
+ .HV_HANDLE_VMEXIT_PA = 0x62847488,
+ .KERNEL_CFI_CHECK = 0x48CF10,
+ .G_VBIOS = 0x3C33A40,
+ .FUN_TRANSMITTER_CONTROL = 0xC0A710,
+ .FUN_MP3_INITIALIZE = 0xA14520,
+ .FUN_MP3_INVOKE = 0xA13150,
+ .HV_MP_STARTUP_CALL = 0xC12D30,
+ .MP_STARTUP_INIT_VECTOR = 0x2AFBB0,
+ .DATA_CAVE = 0x2AE3000,
+ .GAD_PIVOT_ADD_RSP28_RET = 0x24619E,
+ .GAD_STORE_RDI8_RCX_RET = 0x36E9CB,
+ .GAD_SET_DR7_RET = 0xA07D86,
+ .GAD_STORE_RCX_RAX_RET = 0x3067AF,
+ .GAD_MOV_RAX_RDI_RET = 0x257DD1,
+ .GAD_REP_MOVSB_RET = 0x2A9627,
+ .GAD_CLD_RET = 0x3DB600,
+ .GAD_RET_TRAMP = 0x20C911,
+ .GAD_DBREG_RESUME = 0x24AA38,
+ .PS5_WIFI_FW_OFFSET = 0x1508E40,
+ .PS5_WIFI_FW_SIZE = 0x799BC,
+ .HV_EFI_MAP_ROOT = 0x3C490B8,
+};
+
+offset_list off_1020 = {
+ .VMSPACE_VM_VMID = 0x1E4,
+ .VMSPACE_VM_PMAP = 0x1D8,
+ .ACPIGBL_FACS = 0x38491E0,
+ .IDT = 0x3A1C300,
+ .COMMON_TSS = 0x3A1EFE0,
+ .FUN_MEMCPY = 0x28D100,
+ .GAD_ADD_RSP_28_POP_RBP_RET = 0x9E3D84,
+ .GAD_IRETQ = 0x2514ED,
+ .GAD_POP_RAX_RET = 0x20C910,
+ .GAD_POP_RDI_RET = 0x1EFCB8,
+ .GAD_POP_RSI_RET = 0x1B07F0,
+ .GAD_POP_RDX_RET = 0x492E9A,
+ .GAD_POP_RCX_RET = 0x2DDC81,
+ .GAD_POP_RSP_RET = 0x254350,
+ .KERNEL_CODE_CAVE = 0xCB4000,
+ .FUN_PRINTF = 0x4D5F50,
+ .FUN_SMP_RENDEZVOUS = 0xAFFA80,
+ .FUN_SMP_NO_RENDEVOUS_BARRIER = 0x20C911,
+ .HV_CODE_CAVE_PA = 0x62806F00,
+ .HV_HANDLE_VMEXIT_PA = 0x62847488,
+ .KERNEL_CFI_CHECK = 0x48CF00,
+ .G_VBIOS = 0x3C33A40,
+ .FUN_TRANSMITTER_CONTROL = 0xC0A9D0,
+ .FUN_MP3_INITIALIZE = 0xA14740,
+ .FUN_MP3_INVOKE = 0xA13370,
+ .HV_MP_STARTUP_CALL = 0xC12FF0,
+ .MP_STARTUP_INIT_VECTOR = 0x2B1898,
+ .DATA_CAVE = 0x2AE3000,
+ .GAD_PIVOT_ADD_RSP28_RET = 0x24619E,
+ .GAD_STORE_RDI8_RCX_RET = 0x36E9CB,
+ .GAD_SET_DR7_RET = 0xA07FA6,
+ .GAD_STORE_RCX_RAX_RET = 0x3067AF,
+ .GAD_MOV_RAX_RDI_RET = 0x257DD1,
+ .GAD_REP_MOVSB_RET = 0x2A9627,
+ .GAD_CLD_RET = 0x409EC0,
+ .GAD_RET_TRAMP = 0x20C911,
+ .GAD_DBREG_RESUME = 0x24AA38,
+ .PS5_WIFI_FW_OFFSET = 0x1508EC0,
+ .PS5_WIFI_FW_SIZE = 0x799BC,
+ .HV_EFI_MAP_ROOT = 0x3C490B8,
+};
+
+offset_list off_1040 = {
+ .VMSPACE_VM_VMID = 0x1E4,
+ .VMSPACE_VM_PMAP = 0x1D8,
+ .ACPIGBL_FACS = 0x38491E0,
+ .IDT = 0x3A1C300,
+ .COMMON_TSS = 0x3A1EFE0,
+ .FUN_MEMCPY = 0x28D100,
+ .GAD_ADD_RSP_28_POP_RBP_RET = 0x9E3D84,
+ .GAD_IRETQ = 0x2514ED,
+ .GAD_POP_RAX_RET = 0x20C910,
+ .GAD_POP_RDI_RET = 0x1EFCB8,
+ .GAD_POP_RSI_RET = 0x1B07F0,
+ .GAD_POP_RDX_RET = 0x459DFF,
+ .GAD_POP_RCX_RET = 0x2DDC81,
+ .GAD_POP_RSP_RET = 0x254350,
+ .KERNEL_CODE_CAVE = 0xCB4000,
+ .FUN_PRINTF = 0x4D5F50,
+ .FUN_SMP_RENDEZVOUS = 0xAFFA80,
+ .FUN_SMP_NO_RENDEVOUS_BARRIER = 0x20C911,
+ .HV_CODE_CAVE_PA = 0x62806F00,
+ .HV_HANDLE_VMEXIT_PA = 0x62847488,
+ .KERNEL_CFI_CHECK = 0x48CF00,
+ .G_VBIOS = 0x3C33A40,
+ .FUN_TRANSMITTER_CONTROL = 0xC0A9D0,
+ .FUN_MP3_INITIALIZE = 0xA14740,
+ .FUN_MP3_INVOKE = 0xA13370,
+ .HV_MP_STARTUP_CALL = 0xC12FF0,
+ .MP_STARTUP_INIT_VECTOR = 0x2B3AC0,
+ .DATA_CAVE = 0x2AE3000,
+ .GAD_PIVOT_ADD_RSP28_RET = 0x24619E,
+ .GAD_STORE_RDI8_RCX_RET = 0x36E9CB,
+ .GAD_SET_DR7_RET = 0xA07FA6,
+ .GAD_STORE_RCX_RAX_RET = 0x3067AF,
+ .GAD_MOV_RAX_RDI_RET = 0x257DD1,
+ .GAD_REP_MOVSB_RET = 0x2A9627,
+ .GAD_CLD_RET = 0x409EC0,
+ .GAD_RET_TRAMP = 0x20C911,
+ .GAD_DBREG_RESUME = 0x24AA38,
+ .PS5_WIFI_FW_OFFSET = 0x1508EC0,
+ .PS5_WIFI_FW_SIZE = 0x799BC,
+ .HV_EFI_MAP_ROOT = 0x3C490B8,
+};
+
+offset_list off_1060 = {
+ .VMSPACE_VM_VMID = 0x1E4,
+ .VMSPACE_VM_PMAP = 0x1D8,
+ .ACPIGBL_FACS = 0x38491E0,
+ .IDT = 0x3A1C300,
+ .COMMON_TSS = 0x3A1EFE0,
+ .FUN_MEMCPY = 0x28E300,
+ .GAD_ADD_RSP_28_POP_RBP_RET = 0x9E4F84,
+ .GAD_IRETQ = 0x2526ED,
+ .GAD_POP_RAX_RET = 0x20DB10,
+ .GAD_POP_RDI_RET = 0x1F0EB8,
+ .GAD_POP_RSI_RET = 0x1B19F0,
+ .GAD_POP_RDX_RET = 0x3CF802,
+ .GAD_POP_RCX_RET = 0x2DEE81,
+ .GAD_POP_RSP_RET = 0x255550,
+ .KERNEL_CODE_CAVE = 0xCB4000,
+ .FUN_PRINTF = 0x4D7150,
+ .FUN_SMP_RENDEZVOUS = 0xAFFA60,
+ .FUN_SMP_NO_RENDEVOUS_BARRIER = 0x2B82B8,
+ .HV_CODE_CAVE_PA = 0x62806F00,
+ .HV_HANDLE_VMEXIT_PA = 0x628474A8,
+ .KERNEL_CFI_CHECK = 0x48E100,
+ .G_VBIOS = 0x3C33A40,
+ .FUN_TRANSMITTER_CONTROL = 0xC0A9B0,
+ .FUN_MP3_INITIALIZE = 0xA15940,
+ .FUN_MP3_INVOKE = 0xA14570,
+ .HV_MP_STARTUP_CALL = 0xC12FD0,
+ .MP_STARTUP_INIT_VECTOR = 0x2B0CE8,
+ .DATA_CAVE = 0x2AE3000,
+ .GAD_PIVOT_ADD_RSP28_RET = 0x24739E,
+ .GAD_STORE_RDI8_RCX_RET = 0x36FBCB,
+ .GAD_SET_DR7_RET = 0xA091A6,
+ .GAD_STORE_RCX_RAX_RET = 0x3079AF,
+ .GAD_MOV_RAX_RDI_RET = 0x258FD1,
+ .GAD_REP_MOVSB_RET = 0x2AA827,
+ .GAD_CLD_RET = 0x2A6AA8,
+ .GAD_RET_TRAMP = 0x20DB11,
+ .GAD_DBREG_RESUME = 0x24BC38,
+ .PS5_WIFI_FW_OFFSET = 0x1508EC0,
+ .PS5_WIFI_FW_SIZE = 0x799BC,
+ .HOOK_ACPI_WAKEUP_MACHDEP = 0x3D274F,
+
+ .HV_EFI_MAP_ROOT = 0x3C490B8,
+};
+
+/* off_1200: generated from the Wigglez 12xx AIO build. */
+
offset_list off_1200 = {
.IOMMU_SOFTC = 0x3599510,
.VMSPACE_VM_VMID = 0x1FC,
diff --git a/source/utils.c b/source/utils.c
index 387a586..84773ac 100644
--- a/source/utils.c
+++ b/source/utils.c
@@ -97,6 +97,41 @@ int set_offsets(void) {
case 0x0761:
env_offset = off_0761;
break;
+ case 0x1000:
+ if (kernel_get_fw_version() != 0x10000046U) {
+ notify("Only the retail 10.00 build (0x10000046) is supported\n");
+ return -1;
+ }
+ env_offset = off_1000;
+ break;
+ case 0x1001:
+ if (kernel_get_fw_version() != 0x10010000U) {
+ notify("Only the retail 10.01 build (0x10010000) is supported\n");
+ return -1;
+ }
+ env_offset = off_1001;
+ break;
+ case 0x1020:
+ if (kernel_get_fw_version() != 0x10200006U) {
+ notify("Only the retail 10.20 build (0x10200006) is supported\n");
+ return -1;
+ }
+ env_offset = off_1020;
+ break;
+ case 0x1040:
+ if (kernel_get_fw_version() != 0x10400007U) {
+ notify("Only the retail 10.40 build (0x10400007) is supported\n");
+ return -1;
+ }
+ env_offset = off_1040;
+ break;
+ case 0x1060:
+ if (kernel_get_fw_version() != 0x10600006U) {
+ notify("Only the retail 10.60 build (0x10600006) is supported\n");
+ return -1;
+ }
+ env_offset = off_1060;
+ break;
case 0x1100:
if (kernel_get_fw_version() != 0x11000043U) {
notify("Only the retail 11.00 build (0x11000043) is supported\n");