rt/snapraid
1
0
Fork 0
mirror of https://github.com/amadvance/snapraid.git synced 2026-10-26 19:01:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Handle the case of malformed IOCTL answer for disk descriptor

Browse source
This commit is contained in:
Andrea Mazzoleni 2026-03-20 13:41:09 +01:00
parent 2b6281cd81
commit f156915125
2 changed files with 43 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
HISTORY
View file

@ -1,6 +1,10 @@
SnapRAID HISTORY
================
14.0rc3e 22/03/2026
===================
* Fixed reading of serial number in Windows
14.0rc3d 22/03/2026
===================
* Fixed data race on the new RELOCATED flag

45
cmdline/mingw.c
View file

@ -2537,6 +2537,40 @@ retry:
return 0;
}
static int serial_descriptor(PSTORAGE_DEVICE_DESCRIPTOR descriptor, size_t size, char* output, size_t output_size)
{
if (descriptor->SerialNumberOffset == 0
|| descriptor->SerialNumberOffset == (DWORD)-1
|| descriptor->SerialNumberOffset >= size)
return -1;
const char* raw = (const char*)descriptor + descriptor->SerialNumberOffset;
size_t len = 0;
/* find the length, not assuming a 0 ending */
while (descriptor->SerialNumberOffset + len < size && raw[len] != 0)
++len;
if (len < 6) /* a serial cannot be so short */
return -1;
if (len + 1 > output_size)
return -1;
/* all must be printable */
for (size_t i = 0; i < len; ++i) {
if (!isprint((unsigned char)raw[i]))
return -1;
}
memcpy(output, raw, len);
output[len] = 0;
strtrim(output);
return 0;
}
static void devattr_property(HANDLE h, char* serial, char* model, char* inter)
{
STORAGE_PROPERTY_QUERY query = { 0 };
@ -2568,15 +2602,14 @@ static void devattr_property(HANDLE h, char* serial, char* model, char* inter)
strtrim(model);
}
if (serial && *serial == 0 && desc->SerialNumberOffset) {
if (serial && *serial == 0) {
/*
* This is the RAW serial, maybe HEX encoded, maybe BYTES SWAPPED
* but we don't care because we just need any identifier
* This is the RAW serial, maybe HEX encoded, maybe BYTES SWAPPED,
* but we don't care because we just need any identifier.
*
* If smartctl was not able to read it, we now accept anything
* If smartctl was not able to read it, we now accept anything.
*/
snprintf(serial, SMART_MAX, "%s", (char*)(buffer + desc->SerialNumberOffset));
strtrim(serial);
serial_descriptor(desc, bytes, serial, SMART_MAX);
}
#define BusTypeVirtual 0x0E