From 714e5ea2564b572e31f17e081ad6ee410e3ff6cd Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@b08762b0-b915-fc4b-9d8c-17b2551a87ff>
Date: Wed, 12 Mar 2008 10:56:22 +0000
Subject: [PATCH] =?UTF-8?q?(=E6=9B=B4=E6=96=B0:Akabane=20Jumpei)=20?=
 =?UTF-8?q?=E3=83=BBArm9=E5=B8=B8=E9=A7=90=E3=83=A2=E3=82=B8=E3=83=A5?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E3=81=AE=E3=82=B5=E3=82=A4=E3=82=BA=E3=81=8C?=
 =?UTF-8?q?Secure=E9=A0=98=E5=9F=9F=E5=86=85=E3=81=AB=E3=81=8A=E3=81=95?=
 =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A6=E3=81=84=E3=82=8B=E5=A0=B4=E5=90=88?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=20(Secure=E9=A0=98=E5=9F=9F?=
 =?UTF-8?q?=E3=81=AB=E3=81=8A=E3=81=95=E3=81=BE=E3=81=A3=E3=81=A6=E3=81=84?=
 =?UTF-8?q?=E3=82=8B=E5=A0=B4=E5=90=88=E3=81=AFGame=E9=A0=98=E5=9F=9F?=
 =?UTF-8?q?=E8=AA=AD=E3=81=BF=E9=83=A8=E5=88=86=E3=82=92=E9=A3=9B=E3=81=B0?=
 =?UTF-8?q?=E3=81=99)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Users/lillianskinner/Downloads/platinum/twl/TwlIPL/trunk@871 b08762b0-b915-fc4b-9d8c-17b2551a87ff
---
 .../hotsw/ARM7/include/hotswTypes.h           |  1 +
 .../libraries_sysmenu/hotsw/ARM7/src/hotsw.c  | 32 +++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
index bac9c796..a502516c 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
+++ b/build/libraries_sysmenu/hotsw/ARM7/include/hotswTypes.h
@@ -217,6 +217,7 @@ typedef enum HotSwState{
     HOTSW_ID_CHECK_ERROR,
     HOTSW_PULLED_OUT_ERROR,
     HOTSW_DATA_DECRYPT_ERROR,
+    HOTSW_BUFFER_OVERRUN_ERROR,
     HOTSW_UNEXPECTED_ERROR
 } HotSwState;
 
diff --git a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
index b1bba2e2..a37bc66f 100644
--- a/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
+++ b/build/libraries_sysmenu/hotsw/ARM7/src/hotsw.c
@@ -602,10 +602,16 @@ static HotSwState LoadStaticModule(void)
     
 	s_cbData.arm9Stc = (u32)s_cbData.pBootSegBuf->rh.s.main_ram_address;
 	// 配置先と再配置情報を取得 & Arm9の常駐モジュール残りを指定先に転送
-	SYSM_CheckLoadRegionAndSetRelocateInfo( ARM9_STATIC, &s_cbData.arm9Stc, s_cbData.pBootSegBuf->rh.s.main_size, &SYSMi_GetWork()->romRelocateInfo[ARM9_STATIC] , s_cbData.twlFlg);
-    retval = ReadPageGame(&s_cbData,		s_cbData.pBootSegBuf->rh.s.main_rom_offset + SECURE_SEGMENT_SIZE,
-                                  	(u32 *)(s_cbData.arm9Stc 						   + SECURE_SEGMENT_SIZE),
-                                	    	s_cbData.pBootSegBuf->rh.s.main_size       - SECURE_SEGMENT_SIZE);
+    if(SYSM_CheckLoadRegionAndSetRelocateInfo( ARM9_STATIC, &s_cbData.arm9Stc, s_cbData.pBootSegBuf->rh.s.main_size, &SYSMi_GetWork()->romRelocateInfo[ARM9_STATIC] , s_cbData.twlFlg)){
+    	if(s_cbData.pBootSegBuf->rh.s.main_size > SECURE_SEGMENT_SIZE){
+	   		retval = ReadPageGame(&s_cbData,		s_cbData.pBootSegBuf->rh.s.main_rom_offset + SECURE_SEGMENT_SIZE,
+           		                      		(u32 *)(s_cbData.arm9Stc 						   + SECURE_SEGMENT_SIZE),
+               		                	    	    s_cbData.pBootSegBuf->rh.s.main_size 	   - SECURE_SEGMENT_SIZE);
+       	}
+    }
+    else{
+		retval = HOTSW_BUFFER_OVERRUN_ERROR;
+    }
 
     if(retval != HOTSW_SUCCESS){
 		return retval;
@@ -613,10 +619,14 @@ static HotSwState LoadStaticModule(void)
     
 	s_cbData.arm7Stc = (u32)s_cbData.pBootSegBuf->rh.s.sub_ram_address;
     // 配置先と再配置情報を取得 & Arm7の常駐モジュールを指定先に転送
-	SYSM_CheckLoadRegionAndSetRelocateInfo( ARM7_STATIC, &s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size, &SYSMi_GetWork()->romRelocateInfo[ARM7_STATIC] , s_cbData.twlFlg);
-    state  = ReadPageGame(&s_cbData, s_cbData.pBootSegBuf->rh.s.sub_rom_offset, (u32 *)s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size);
-    retval = (retval == HOTSW_SUCCESS) ? state : retval;
-
+    if(SYSM_CheckLoadRegionAndSetRelocateInfo( ARM7_STATIC, &s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size, &SYSMi_GetWork()->romRelocateInfo[ARM7_STATIC] , s_cbData.twlFlg)){
+    	state  = ReadPageGame(&s_cbData, s_cbData.pBootSegBuf->rh.s.sub_rom_offset, (u32 *)s_cbData.arm7Stc, s_cbData.pBootSegBuf->rh.s.sub_size);
+    	retval = (retval == HOTSW_SUCCESS) ? state : retval;
+    }
+    else{
+        retval = HOTSW_BUFFER_OVERRUN_ERROR;
+    }
+    
     if(retval != HOTSW_SUCCESS){
 		return retval;
     }
@@ -1615,9 +1625,13 @@ static void DebugPrintErrorMessage(HotSwState state)
       case HOTSW_DATA_DECRYPT_ERROR:
         OS_PutString("   - Error 7 : Data Decrypt\n");
         break;
+
+      case HOTSW_BUFFER_OVERRUN_ERROR:
+        OS_PutString("   - Error 8 : Buffer OverRun\n");
+        break;
         
       case HOTSW_UNEXPECTED_ERROR:
-        OS_PutString("   - Error 8 : Unexpected\n");
+        OS_PutString("   - Error 9 : Unexpected\n");
         break;
 
       default :