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

disable whitelisting (will hopefully go away entirely); fix product trimming; better logging

Browse Source
This commit is contained in:
Glenn Maynard
2005-02-21 03:47:47 +00:00
parent 5a75be89ec
commit 4b726d2e23
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/arch/MemoryCard/MemoryCardDriverThreaded_Linux.cpp
+8 -7
View File
@@ -262,6 +262,7 @@ struct WhiteListEntry
}; };
static const WhiteListEntry g_AllowedEntries[] = static const WhiteListEntry g_AllowedEntries[] =
{ {
#if 0
{ 0x0781, -1, "", "Cruzer" }, // SanDisk Cruzer* drives { 0x0781, -1, "", "Cruzer" }, // SanDisk Cruzer* drives
// 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.
// { 0x045a, -1, "", "" }, // Diamond Multimedia Systems (Rio) // { 0x045a, -1, "", "" }, // Diamond Multimedia Systems (Rio)
@@ -275,6 +276,8 @@ static const WhiteListEntry g_AllowedEntries[] =
{ 0x0ea0, -1, "", "Flash Disk" }, // other PNY Attache pen drives { 0x0ea0, -1, "", "Flash Disk" }, // other PNY Attache pen drives
{ 0x0ef5, -1, "", "Intelligent|Traveling" }, // PQI Intelligent Stick and Traveling Disk { 0x0ef5, -1, "", "Intelligent|Traveling" }, // PQI Intelligent Stick and Traveling Disk
{ 0x08ec, -1, "", "M-Disk" }, // M-Systems flash drive { 0x08ec, -1, "", "M-Disk" }, // M-Systems flash drive
#endif
{ -1, -1, "", "" }, // allow anything
}; };
bool IsDeviceAllowed( int idVendor, int idProduct, CString sVendor, CString sProduct ) bool IsDeviceAllowed( int idVendor, int idProduct, CString sVendor, CString sProduct )
{ {
@@ -399,7 +402,7 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
if( ReadFile( sPath + "device/../product", sBuf ) ) if( ReadFile( sPath + "device/../product", sBuf ) )
{ {
usbd.sProduct = sBuf; usbd.sProduct = sBuf;
TrimRight( usbd.sVendor ); TrimRight( usbd.sProduct );
} }
if( ReadFile( sPath + "device/../manufacturer", sBuf ) ) if( ReadFile( sPath + "device/../manufacturer", sBuf ) )
{ {
@@ -407,13 +410,11 @@ void GetNewStorageDevices( vector<UsbStorageDevice>& vDevicesOut )
TrimRight( usbd.sVendor ); TrimRight( usbd.sVendor );
} }
if( IsDeviceAllowed( usbd.idVendor, usbd.idProduct, usbd.sVendor, usbd.sProduct ) ) bool bAllowed = IsDeviceAllowed( usbd.idVendor, usbd.idProduct, usbd.sVendor, usbd.sProduct );
{ LOG->Trace( "iBus: %d, iLevel: %d, iPort: %d, sSerial = %s (%s)",
usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sSerial.c_str(), bAllowed? "allowed":"disallowed" );
if( bAllowed )
vDevicesOut.push_back( usbd ); vDevicesOut.push_back( usbd );
LOG->Trace( "iBus: %d, iLevel: %d, iPort: %d, sSerial = %s",
usbd.iBus, usbd.iLevel, usbd.iPort, usbd.sSerial.c_str() );
}
} }
} }