LK.diff

diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index aefefdead..a6744e4b6 100644
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -3666,9 +3666,11 @@ void aboot_fastboot_register_commands(void)
 	int i;
 	char hw_platform_buf[MAX_RSP_SIZE];
 
+	extern void cmd_oem_cve_2022_22063(const char *arg, void *data, unsigned sz);
 	struct fastboot_cmd_desc cmd_list[] = {
 						/* By default the enabled list is empty. */
 						{"", NULL},
+						{"oem CVE-2022-22063", cmd_oem_cve_2022_22063},
 						/* move commands enclosed within the below ifndef to here
 						 * if they need to be enabled in user build.
 						 */
diff --git a/platform/msm8916/platform.c b/platform/msm8916/platform.c
index 5a8174caf..d20727064 100644
--- a/platform/msm8916/platform.c
+++ b/platform/msm8916/platform.c
@@ -67,6 +67,9 @@ static mmu_section_t mmu_section_table[] = {
 	{    MIPI_FB_ADDR,      MIPI_FB_ADDR,     10,              COMMON_MEMORY},
 	{    SCRATCH_ADDR,      SCRATCH_ADDR,     256,              SCRATCH_MEMORY},
         {    RPMB_SND_RCV_BUF,      RPMB_SND_RCV_BUF,        RPMB_SND_RCV_BUF_SZ,    IOMAP_MEMORY},
+	/* Map boot remapper and hypervisor memory */
+	{    0,                 0,                1,                COMMON_MEMORY},
+	{    0x86400000,        0x86400000,       1,                COMMON_MEMORY},
 };
 
 
diff --git a/platform/msm8916/rules.mk b/platform/msm8916/rules.mk
index d57b92c2a..c15df7315 100644
--- a/platform/msm8916/rules.mk
+++ b/platform/msm8916/rules.mk
@@ -19,6 +19,7 @@ DEVS += fbcon
 MODULES += dev/fbcon
 
 OBJS += \
+       $(LOCAL_DIR)/CVE-2022-22063.o \
        $(LOCAL_DIR)/platform.o \
        $(LOCAL_DIR)/acpuclock.o \
        $(LOCAL_DIR)/msm8916-clock.o \