aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for boot blocks preceding super block and

Browse Source 
misaligned superblocks (optical discs).
This commit is contained in:
Natalia Portillo
2017-08-06 15:46:59 +01:00
parent 7adf8ae3ab
commit 3eda647ef5
1 changed files with 91 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
DiscImageChef.Filesystems/XFS.cs
View File

@@ -35,6 +35,7 @@ using System.Collections.Generic;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using DiscImageChef.CommonTypes; using DiscImageChef.CommonTypes;
using DiscImageChef.Console;
namespace DiscImageChef.Filesystems namespace DiscImageChef.Filesystems
{ {
@@ -126,19 +127,57 @@ namespace DiscImageChef.Filesystems
if(imagePlugin.GetSectorSize() < 512) if(imagePlugin.GetSectorSize() < 512)
return false; return false;
XFS_Superblock xfsSb = new XFS_Superblock(); // Misaligned
if(imagePlugin.ImageInfo.xmlMediaType == ImagePlugins.XmlMediaType.OpticalDisc)
{
XFS_Superblock xfsSb = new XFS_Superblock();
uint sbSize = (uint)(Marshal.SizeOf(xfsSb) / imagePlugin.GetSectorSize()); uint sbSize = (uint)((Marshal.SizeOf(xfsSb) + 0x400) / imagePlugin.GetSectorSize());
if(Marshal.SizeOf(xfsSb) % imagePlugin.GetSectorSize() != 0) if((Marshal.SizeOf(xfsSb) + 0x400) % imagePlugin.GetSectorSize() != 0)
sbSize++; sbSize++;
byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize); byte[] sector = imagePlugin.ReadSector(partition.Start, sbSize);
if(sector.Length < Marshal.SizeOf(xfsSb)) if(sector.Length < Marshal.SizeOf(xfsSb))
return false; return false;
xfsSb = BigEndianMarshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sector); byte[] sbpiece = new byte[Marshal.SizeOf(xfsSb)];
return xfsSb.magicnum == XFS_Magic; foreach(int location in new[] { 0, 0x200, 0x400 })
{
Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf(xfsSb));
xfsSb = BigEndianMarshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sbpiece);
DicConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})", location, xfsSb.magicnum, XFS_Magic);
if(xfsSb.magicnum == XFS_Magic)
return true;
}
}
else
{
foreach(ulong location in new[] { 0, 1, 2 })
{
XFS_Superblock xfsSb = new XFS_Superblock();
uint sbSize = (uint)(Marshal.SizeOf(xfsSb) / imagePlugin.GetSectorSize());
if(Marshal.SizeOf(xfsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
if(sector.Length < Marshal.SizeOf(xfsSb))
return false;
xfsSb = BigEndianMarshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sector);
DicConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location, xfsSb.magicnum, XFS_Magic);
if(xfsSb.magicnum == XFS_Magic)
return true;
}
}
return false;
} }
public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information) public override void GetInformation(ImagePlugins.ImagePlugin imagePlugin, Partition partition, out string information)
@@ -149,15 +188,51 @@ namespace DiscImageChef.Filesystems
XFS_Superblock xfsSb = new XFS_Superblock(); XFS_Superblock xfsSb = new XFS_Superblock();
uint sbSize = (uint)(Marshal.SizeOf(xfsSb) / imagePlugin.GetSectorSize()); // Misaligned
if(Marshal.SizeOf(xfsSb) % imagePlugin.GetSectorSize() != 0) if(imagePlugin.ImageInfo.xmlMediaType == ImagePlugins.XmlMediaType.OpticalDisc)
sbSize++; {
uint sbSize = (uint)((Marshal.SizeOf(xfsSb) + 0x400) / imagePlugin.GetSectorSize());
if((Marshal.SizeOf(xfsSb) + 0x400) % imagePlugin.GetSectorSize() != 0)
sbSize++;
byte[] sector = imagePlugin.ReadSectors(partition.Start, sbSize); byte[] sector = imagePlugin.ReadSector(partition.Start, sbSize);
if(sector.Length < Marshal.SizeOf(xfsSb)) if(sector.Length < Marshal.SizeOf(xfsSb))
return; return;
xfsSb = BigEndianMarshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sector); byte[] sbpiece = new byte[Marshal.SizeOf(xfsSb)];
foreach(int location in new[] { 0, 0x200, 0x400 })
{
Array.Copy(sector, location, sbpiece, 0, Marshal.SizeOf(xfsSb));
xfsSb = BigEndianMarshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sbpiece);
DicConsole.DebugWriteLine("XFS plugin", "magic at 0x{0:X3} = 0x{1:X8} (expected 0x{2:X8})", location, xfsSb.magicnum, XFS_Magic);
if(xfsSb.magicnum == XFS_Magic)
break;
}
}
else
{
foreach(ulong location in new[] { 0, 1, 2 })
{
uint sbSize = (uint)(Marshal.SizeOf(xfsSb) / imagePlugin.GetSectorSize());
if(Marshal.SizeOf(xfsSb) % imagePlugin.GetSectorSize() != 0)
sbSize++;
byte[] sector = imagePlugin.ReadSectors(partition.Start + location, sbSize);
if(sector.Length < Marshal.SizeOf(xfsSb))
return;
xfsSb = BigEndianMarshal.ByteArrayToStructureBigEndian<XFS_Superblock>(sector);
DicConsole.DebugWriteLine("XFS plugin", "magic at {0} = 0x{1:X8} (expected 0x{2:X8})", location, xfsSb.magicnum, XFS_Magic);
if(xfsSb.magicnum == XFS_Magic)
break;
}
}
if(xfsSb.magicnum != XFS_Magic) if(xfsSb.magicnum != XFS_Magic)
return; return;