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

[SCSI MODE] Fix handling of corrupt/invalid MODE SENSE (6) block descriptors. Fixes #842

Browse Source
This commit is contained in:
Natalia Portillo
2024-04-30 03:23:28 +01:00
parent 06d6a7cfcb
commit 0d140fac3a
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Aaru.Core/Devices/Dumping/CompactDisc/Error.cs
View File

@@ -114,7 +114,11 @@ partial class Dump
sense = _dev.ModeSense6(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
out _);
if(sense)
Modes.DecodedMode? dcMode6 = null;
if(!sense)
dcMode6 = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
if(sense || dcMode6 is null)
{
sense = _dev.ModeSense10(out cmdBuf, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
out _);
@@ -133,8 +137,6 @@ partial class Dump
}
else
{
Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(cmdBuf, PeripheralDeviceTypes.MultiMediaDevice);
if(dcMode6?.Pages != null)
{
foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage => modePage is

8
Aaru.Core/Devices/Dumping/PlayStationPortable/MemoryStick.cs
View File

@@ -373,7 +373,11 @@ public partial class Dump
sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
_dev.Timeout, out _);
if(sense)
Modes.DecodedMode? dcMode6 = null;
if(!sense)
dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
if(sense || dcMode6 is null)
{
sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
_dev.Timeout, out _);
@@ -392,8 +396,6 @@ public partial class Dump
}
else
{
Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, _dev.ScsiType);
if(dcMode6.HasValue)
{
foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>

8
Aaru.Core/Devices/Dumping/Sbc/Error.cs
View File

@@ -77,7 +77,11 @@ partial class Dump
sense = _dev.ModeSense6(out buffer, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
out _);
if(sense)
Modes.DecodedMode? dcMode6 = null;
if(!sense)
dcMode6 = Modes.DecodeMode6(buffer, _dev.ScsiType);
if(sense || dcMode6 is null)
{
sense = _dev.ModeSense10(out buffer, out _, false, ScsiModeSensePageControl.Current, 0x01, _dev.Timeout,
out _);
@@ -96,8 +100,6 @@ partial class Dump
}
else
{
Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(buffer, _dev.ScsiType);
if(dcMode6?.Pages != null)
{
foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage => modePage is

11
Aaru.Core/Devices/Dumping/XGD.cs
View File

@@ -971,9 +971,6 @@ partial class Dump
Humanize()));
UpdateStatus?.Invoke(string.Format(Localization.Core.Average_write_speed_0,
ByteSize.FromBytes(blockSize * (blocks + 1)).
Per(imageWriteDuration.Seconds()).
Humanize()));
_dumpLog.WriteLine(string.Format(Localization.Core.Dump_finished_in_0,
_dumpStopwatch.Elapsed.Humanize(minUnit: TimeUnit.Second)));
@@ -1071,7 +1068,11 @@ partial class Dump
sense = _dev.ModeSense6(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
_dev.Timeout, out _);
if(sense)
Modes.DecodedMode? dcMode6 = null;
if(!sense)
dcMode6 = Modes.DecodeMode6(readBuffer, PeripheralDeviceTypes.MultiMediaDevice);
if(sense || dcMode6 is null)
{
sense = _dev.ModeSense10(out readBuffer, out _, false, ScsiModeSensePageControl.Current, 0x01,
_dev.Timeout, out _);
@@ -1091,8 +1092,6 @@ partial class Dump
}
else
{
Modes.DecodedMode? dcMode6 = Modes.DecodeMode6(readBuffer, PeripheralDeviceTypes.MultiMediaDevice);
if(dcMode6.HasValue)
{
foreach(Modes.ModePage modePage in dcMode6.Value.Pages.Where(modePage =>

5
Aaru.Decoders/SCSI/Modes/Mode6.cs
View File

@@ -55,6 +55,11 @@ public static partial class Modes
if(modeResponse[3] > 0)
{
// An incorrect size field, we cannot know if the following bytes are really the pages (probably not),
// so consider the MODE SENSE(6) response as invalid
if(modeResponse[3] + 4 > modeResponse.Length)
return null;
header.BlockDescriptors = new BlockDescriptor[modeResponse[3] / 8];
for(var i = 0; i < header.BlockDescriptors.Length; i++)

14
Aaru.Images/ZZZRawImage/Read.cs
View File

@@ -986,10 +986,10 @@ public sealed partial class ZZZRawImage
Modes.DecodedMode? decMode = null;
if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_6, out byte[] mode6))
decMode = Modes.DecodeMode6(mode6, devType);
else if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_10, out byte[] mode10))
if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_10, out byte[] mode10))
decMode = Modes.DecodeMode10(mode10, devType);
else if(_mediaTags.TryGetValue(MediaTagType.SCSI_MODESENSE_6, out byte[] mode6))
decMode = Modes.DecodeMode6(mode6, devType);
byte mediumType = 0;
byte densityCode = 0;
@@ -1067,8 +1067,8 @@ public sealed partial class ZZZRawImage
_imageInfo.MediaType = MediaTypeFromDevice.GetFromScsi((byte)devType, _imageInfo.DriveManufacturer,
_imageInfo.DriveModel, mediumType, densityCode,
_imageInfo.Sectors, _imageInfo.SectorSize,
_mediaTags.ContainsKey(MediaTagType.
USB_Descriptors), _rawCompactDisc);
_mediaTags.ContainsKey(MediaTagType
.USB_Descriptors), _rawCompactDisc);
}
if(_imageInfo.MediaType == MediaType.Unknown)
@@ -1164,8 +1164,8 @@ public sealed partial class ZZZRawImage
var fs = new FileStream(basename + ".metadata.json", FileMode.Open);
AaruMetadata =
(JsonSerializer.Deserialize(fs, typeof(MetadataJson), MetadataJsonContext.Default) as MetadataJson)?
.AaruMetadata;
(JsonSerializer.Deserialize(fs, typeof(MetadataJson), MetadataJsonContext.Default) as MetadataJson)
?.AaruMetadata;
fs.Close();
}