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

Fix overflow with small sectors in BSD disklabel.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-03 00:25:22 +01:00
parent 449aa3690e
commit f5cfee44ab
1 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
DiscImageChef.Partitions/BSD.cs
View File

@@ -73,6 +73,9 @@ namespace DiscImageChef.Partitions
foreach(uint offset in labelOffsets) foreach(uint offset in labelOffsets)
{ {
byte[] sector = new byte[MAX_LABEL_SIZE]; byte[] sector = new byte[MAX_LABEL_SIZE];
if(offset + MAX_LABEL_SIZE > tmp.Length) break;
Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE); Array.Copy(tmp, offset, sector, 0, MAX_LABEL_SIZE);
dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector); dl = Marshal.ByteArrayToStructureLittleEndian<DiskLabel>(sector);
DicConsole.DebugWriteLine("BSD plugin", DicConsole.DebugWriteLine("BSD plugin",
@@ -372,89 +375,89 @@ namespace DiscImageChef.Partitions
/// <summary> /// <summary>
/// <see cref="DISKMAGIC" /> /// <see cref="DISKMAGIC" />
/// </summary> /// </summary>
public uint d_magic; public readonly uint d_magic;
/// <summary> /// <summary>
/// <see cref="dType" /> /// <see cref="dType" />
/// </summary> /// </summary>
public dType d_type; public readonly dType d_type;
/// <summary>Disk subtype</summary> /// <summary>Disk subtype</summary>
public ushort d_subtype; public readonly ushort d_subtype;
/// <summary>Type name</summary> /// <summary>Type name</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
public byte[] d_typename; public readonly byte[] d_typename;
/// <summary>Pack identifier</summary> /// <summary>Pack identifier</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 16)]
public byte[] d_packname; public readonly byte[] d_packname;
/// <summary>Bytes per sector</summary> /// <summary>Bytes per sector</summary>
public uint d_secsize; public readonly uint d_secsize;
/// <summary>Sectors per track</summary> /// <summary>Sectors per track</summary>
public uint d_nsectors; public readonly uint d_nsectors;
/// <summary>Tracks per cylinder</summary> /// <summary>Tracks per cylinder</summary>
public uint d_ntracks; public readonly uint d_ntracks;
/// <summary>Cylinders per unit</summary> /// <summary>Cylinders per unit</summary>
public uint d_ncylinders; public readonly uint d_ncylinders;
/// <summary>Sectors per cylinder</summary> /// <summary>Sectors per cylinder</summary>
public uint d_secpercyl; public readonly uint d_secpercyl;
/// <summary>Sectors per unit</summary> /// <summary>Sectors per unit</summary>
public uint d_secperunit; public readonly uint d_secperunit;
/// <summary>Spare sectors per track</summary> /// <summary>Spare sectors per track</summary>
public ushort d_sparespertrack; public readonly ushort d_sparespertrack;
/// <summary>Spare sectors per cylinder</summary> /// <summary>Spare sectors per cylinder</summary>
public ushort d_sparespercyl; public readonly ushort d_sparespercyl;
/// <summary>Alternate cylinders</summary> /// <summary>Alternate cylinders</summary>
public uint d_acylinders; public readonly uint d_acylinders;
/// <summary>Rotational speed</summary> /// <summary>Rotational speed</summary>
public ushort d_rpm; public readonly ushort d_rpm;
/// <summary>Hardware sector interleave</summary> /// <summary>Hardware sector interleave</summary>
public ushort d_interleave; public readonly ushort d_interleave;
/// <summary>Sector 0 skew per track</summary> /// <summary>Sector 0 skew per track</summary>
public ushort d_trackskew; public readonly ushort d_trackskew;
/// <summary>Sector 0 sker per cylinder</summary> /// <summary>Sector 0 sker per cylinder</summary>
public ushort d_cylskeew; public readonly ushort d_cylskeew;
/// <summary>Head switch time in microseconds</summary> /// <summary>Head switch time in microseconds</summary>
public uint d_headswitch; public readonly uint d_headswitch;
/// <summary>Track to track seek in microseconds</summary> /// <summary>Track to track seek in microseconds</summary>
public uint d_trkseek; public readonly uint d_trkseek;
/// <summary> /// <summary>
/// <see cref="dFlags" /> /// <see cref="dFlags" />
/// </summary> /// </summary>
public dFlags d_flags; public readonly dFlags d_flags;
/// <summary>Drive-specific information</summary> /// <summary>Drive-specific information</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
public uint[] d_drivedata; public readonly uint[] d_drivedata;
/// <summary>Reserved</summary> /// <summary>Reserved</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 5)]
public uint[] d_spare; public readonly uint[] d_spare;
/// <summary><see cref="DISKMAGIC" /> again</summary> /// <summary><see cref="DISKMAGIC" /> again</summary>
public uint d_magic2; public readonly uint d_magic2;
/// <summary>XOR of data</summary> /// <summary>XOR of data</summary>
public ushort d_checksum; public readonly ushort d_checksum;
/// <summary>How many partitions</summary> /// <summary>How many partitions</summary>
public ushort d_npartitions; public readonly ushort d_npartitions;
/// <summary>Size of boot area in bytes</summary> /// <summary>Size of boot area in bytes</summary>
public uint d_bbsize; public readonly uint d_bbsize;
/// <summary>Maximum size of superblock in bytes</summary> /// <summary>Maximum size of superblock in bytes</summary>
public uint d_sbsize; public readonly uint d_sbsize;
/// <summary>Partitions</summary> /// <summary>Partitions</summary>
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)] [MarshalAs(UnmanagedType.ByValArray, SizeConst = 22)]
public BSDPartition[] d_partitions; public readonly BSDPartition[] d_partitions;
} }
[StructLayout(LayoutKind.Sequential, Pack = 1)] [StructLayout(LayoutKind.Sequential, Pack = 1)]
struct BSDPartition struct BSDPartition
{ {
/// <summary>Sectors in partition</summary> /// <summary>Sectors in partition</summary>
public uint p_size; public readonly uint p_size;
/// <summary>Starting sector</summary> /// <summary>Starting sector</summary>
public uint p_offset; public readonly uint p_offset;
/// <summary>Fragment size</summary> /// <summary>Fragment size</summary>
public uint p_fsize; public readonly uint p_fsize;
/// <summary>Filesystem type, <see cref="fsType" /></summary> /// <summary>Filesystem type, <see cref="fsType" /></summary>
public fsType p_fstype; public readonly fsType p_fstype;
/// <summary>Fragment size</summary> /// <summary>Fragment size</summary>
public byte p_frag; public readonly byte p_frag;
/// <summary>Cylinder per group</summary> /// <summary>Cylinder per group</summary>
public ushort p_cpg; public readonly ushort p_cpg;
} }
} }
} }