nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't check the initrd on JSVM.

This commit is contained in:
Jonas 'Sortie' Termansen 2011-12-05 19:36:15 +01:00
parent 0bb91ee161
commit 7e55f325fc
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sortix/initrd.cpp
View File

@ -38,6 +38,12 @@ namespace Sortix
{ {
byte* initrd; byte* initrd;
size_t initrdsize; size_t initrdsize;
#ifdef JSSORTIX
// JSVM never tells JSSortix how big the initrd is!
const bool CHECK_CHECKSUM = false;
#else
const bool CHECK_CHECKSUM = true;
#endif
size_t GetNumFiles() size_t GetNumFiles()
{ {
@ -63,6 +69,19 @@ namespace Sortix
return checksum; return checksum;
} }
void CheckSum()
{
Trailer* trailer = (Trailer*) (initrd + initrdsize - sizeof(Trailer));
uint8_t checksum = ContinueChecksum(0, initrd, initrdsize - sizeof(Trailer));
if ( trailer->sum != checksum )
{
PanicF("InitRD Checksum failed: the ramdisk may have been "
"corrupted by the bootloader: Got %u instead of %u "
"when checking the ramdisk at 0x%p + 0x%zx bytes\n",
checksum, trailer->sum, initrd, initrdsize);
}
}
void Init(byte* theinitrd, size_t size) void Init(byte* theinitrd, size_t size)
{ {
initrd = theinitrd; initrd = theinitrd;
@ -74,15 +93,7 @@ namespace Sortix
if ( size < sizeneeded ) { PanicF("initrd.cpp: initrd is too small"); } if ( size < sizeneeded ) { PanicF("initrd.cpp: initrd is too small"); }
// TODO: We need to do more validation here! // TODO: We need to do more validation here!
Trailer* trailer = (Trailer*) (initrd + initrdsize - sizeof(Trailer)); if ( CHECK_CHECKSUM ) { CheckSum(); }
uint8_t checksum = ContinueChecksum(0, initrd, initrdsize - sizeof(Trailer));
if ( trailer->sum != checksum )
{
PanicF("InitRD Checksum failed: the ramdisk may have been "
"corrupted by the bootloader: Got %u instead of %u "
"when checking the ramdisk at 0x%p + 0x%zx bytes\n",
checksum, trailer->sum, initrd, initrdsize);
}
} }
byte* Open(const char* filepath, size_t* size) byte* Open(const char* filepath, size_t* size)