actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

clean up whitelist, add entry for Creative Labs MuVo

Browse Source
This commit is contained in:
Chris Danford
2004-10-07 19:48:24 +00:00
parent 44e46c74de
commit c47b7fb124
2 changed files with 43 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriver.h
+2
View File
@@ -19,6 +19,7 @@ struct UsbStorageDevice
bWriteTestSucceeded = false; bWriteTestSucceeded = false;
sName = ""; sName = "";
idVendor = 0; idVendor = 0;
idProduct = 0;
sVendor = ""; sVendor = "";
sProduct = ""; sProduct = "";
}; };
@@ -33,6 +34,7 @@ struct UsbStorageDevice
bool bWriteTestSucceeded; // only valid if bNeedsWriteTest == false bool bWriteTestSucceeded; // only valid if bNeedsWriteTest == false
CString sName; // Name in the profile on the memory card. CString sName; // Name in the profile on the memory card.
int idVendor; int idVendor;
int idProduct;
CString sVendor; CString sVendor;
CString sProduct; CString sProduct;
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+38 -25
View File
@@ -334,41 +334,45 @@ void MemoryCardDriverThreaded_Linux::MountThreadDoOneUpdate()
CHECKPOINT; CHECKPOINT;
} }
static const int g_iAllowedVendorIds[] = struct WhiteListEntry
{
int idVendor; // -1 = "always match"
int idProduct; // -1 = "always match"
const char *szVendorRegex; // empty string matches all
const char *szProductRegex; // empty string matches all
};
static const WhiteListEntry g_AllowedEntries[] =
{ {
0x0781, // SanDisk Corp. { 0x0781, -1, "", "" }, // all SanDisk Cruizer drives
//0x045a, // Diamond Multimedia Systems (Rio)
// Disallow the Rio Carbon. After several mounts, usb-storage gets into a state where mounting will fail. // Disallow the Rio Carbon. After several mounts, usb-storage gets into a state where mounting will fail.
0x04e8, // Samsung Electronics Co., Ltd. (Kingston) // { 0x045a, -1, "", "" }, // Diamond Multimedia Systems (Rio)
0x05dc, // Lexar Media, Inc. { 0x04e8, -1, "Kingston|KINGSTON", "" }, // Kingston pen drives manufactured by Samsung
{ 0x05dc, -1, "", "" }, // All Lexar flash drives
{ 0x041e, -1, "", "^NOMAD MuVo$|^NOMAD MuVo .X" }, // Creative Labs Nomad MuVo flash drives (hard drive players excluded)
}; };
static const CString g_sAllowedVendorRegex[] = bool IsDeviceAllowed( int idVendor, int idProduct, CString sVendor, CString sProduct )
{
"Kingston",
"KINGSTON",
};
bool IsDeviceAllowed( int idVendor, CString sVendor, CString sProduct )
{ {
bool bAllowed = false; bool bAllowed = false;
vector<int> vAllowedVendorIds( &g_iAllowedVendorIds[0], &g_iAllowedVendorIds[ARRAYSIZE(g_iAllowedVendorIds)-1] ); for( unsigned i=0; i<ARRAYSIZE(g_AllowedEntries); i++ )
vector<int>::const_iterator iter = find( vAllowedVendorIds.begin(), vAllowedVendorIds.end(), idVendor ); {
bAllowed = iter != vAllowedVendorIds.end(); const WhiteListEntry &entry = g_AllowedEntries[i];
if( entry.idVendor != -1 && entry.idVendor != idVendor )
continue;
if( entry.idProduct != -1 && entry.idProduct != idProduct )
continue;
Regex regexVendor( entry.szVendorRegex );
if( !regexVendor.Compare(sVendor) )
continue;
Regex regexProduct( entry.szProductRegex );
if( !regexProduct.Compare(sProduct) )
continue;
if( !bAllowed )
{
for( int i=0; i<ARRAYSIZE(g_sAllowedVendorRegex); i++ )
{
Regex regex( g_sAllowedVendorRegex[i] );
if( regex.Compare(sVendor) )
{
bAllowed = true; bAllowed = true;
break; break;
} }
}
}
LOG->Trace( "Device '%X':'%s':'%s' is %sallowed.", idVendor, sVendor.c_str(), sProduct.c_str(), bAllowed?"":"not " ); LOG->Trace( "idVendor 0x%04X, idDevice 0x%04X, Vendor '%s', Product '%s' is %sallowed.", idVendor, idProduct, sVendor.c_str(), sProduct.c_str(), bAllowed?"":"not " );
return bAllowed; return bAllowed;
} }
@@ -416,7 +420,7 @@ bool ReadUsbStorageDescriptor( CString fn, int iScsiIndex, vector<UsbStorageDevi
{ {
UsbStorageDevice& usbd = vDevicesOut[j]; UsbStorageDevice& usbd = vDevicesOut[j];
if( usbd.sSerial == szSerial && IsDeviceAllowed( usbd.idVendor, sVendor, sProduct ) ) if( usbd.sSerial == szSerial && IsDeviceAllowed( usbd.idVendor, usbd.idProduct, sVendor, sProduct ) )
{ {
usbd.iScsiIndex = iScsiIndex; usbd.iScsiIndex = iScsiIndex;
usbd.sVendor = sVendor; usbd.sVendor = sVendor;
@@ -554,6 +558,15 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
continue; // stop processing this line continue; // stop processing this line
} }
// idProduct 0x4106
int idProduct;
iRet = sscanf( sLine.c_str(), " idProduct 0x%x", &idProduct );
if( iRet == 1 )
{
usbd.idProduct = idProduct;
continue; // stop processing this line
}
// iSerial 3 1125198948886 // iSerial 3 1125198948886
char szSerial[1024]; char szSerial[1024];
iRet = sscanf( sLine.c_str(), " iSerial %d %[^\n]", &iThrowAway, szSerial ); iRet = sscanf( sLine.c_str(), " iSerial %d %[^\n]", &iThrowAway, szSerial );