X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FFilesystems%2FExt2%2Fext2.c;h=ad96cc85c1bbcf628756f99b6cf295b53b582fba;hb=b1873b4cff47aae8ada8cc303ea01b475cc7ccc8;hp=ac3d7e5c5fed14d7c216b09ed9c964d95458d567;hpb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;p=tpg%2Facess2.git

diff --git a/Modules/Filesystems/Ext2/ext2.c b/Modules/Filesystems/Ext2/ext2.c
index ac3d7e5c..ad96cc85 100644
--- a/Modules/Filesystems/Ext2/ext2.c
+++ b/Modules/Filesystems/Ext2/ext2.c
@@ -15,7 +15,7 @@
 // === PROTOTYPES ===
  int	Ext2_Install(char **Arguments);
 // Interface Functions
-tVFS_Node	*Ext2_InitDevice(char *Device, char **Options);
+tVFS_Node	*Ext2_InitDevice(const char *Device, const char **Options);
 void		Ext2_Unmount(tVFS_Node *Node);
 void		Ext2_CloseFile(tVFS_Node *Node);
 // Internal Helpers
@@ -44,13 +44,12 @@ int Ext2_Install(char **Arguments)
 }
 
 /**
- \fn tVFS_Node *Ext2_InitDevice(char *Device, char **Options)
  \brief Initializes a device to be read by by the driver
  \param Device	String - Device to read from
  \param Options	NULL Terminated array of option strings
  \return Root Node
 */
-tVFS_Node *Ext2_InitDevice(char *Device, char **Options)
+tVFS_Node *Ext2_InitDevice(const char *Device, const char **Options)
 {
 	tExt2_Disk	*disk;
 	 int	fd;
@@ -73,7 +72,8 @@ tVFS_Node *Ext2_InitDevice(char *Device, char **Options)
 	
 	// Sanity Check Magic value
 	if(sb.s_magic != 0xEF53) {
-		Log_Warning("EXT2", "Volume '%s' is not an EXT2 volume", Device);
+		Log_Warning("EXT2", "Volume '%s' is not an EXT2 volume (0x%x != 0xEF53)",
+			Device, sb.s_magic);
 		VFS_Close(fd);
 		LEAVE('n');
 		return NULL;
@@ -320,15 +320,17 @@ void Ext2_int_UpdateSuperblock(tExt2_Disk *Disk)
 	if(ngrp <= 1)	return;
 	VFS_WriteAt(Disk->FD, 1*bpg*Disk->BlockSize, 1024, &Disk->SuperBlock);
 	
+	#define INT_MAX	(((long long int)1<<(sizeof(int)*8))-1)
+	
 	// Powers of 3
-	for( i = 3; i < ngrp; i *= 3 )
+	for( i = 3; i < ngrp && i < INT_MAX/3; i *= 3 )
 		VFS_WriteAt(Disk->FD, i*bpg*Disk->BlockSize, 1024, &Disk->SuperBlock);
 	
 	// Powers of 5
-	for( i = 5; i < ngrp; i *= 5 )
+	for( i = 5; i < ngrp && i < INT_MAX/5; i *= 5 )
 		VFS_WriteAt(Disk->FD, i*bpg*Disk->BlockSize, 1024, &Disk->SuperBlock);
 	
 	// Powers of 7
-	for( i = 7; i < ngrp; i *= 7 )
+	for( i = 7; i < ngrp && i < INT_MAX/7; i *= 7 )
 		VFS_WriteAt(Disk->FD, i*bpg*Disk->BlockSize, 1024, &Disk->SuperBlock);
 }