ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Use RtlDosPathNameToNtPathName_U to validate the path in GetVolumeInformationW.

This commit is contained in:
Alexandre Julliard 2010-10-20 12:17:35 +02:00
parent 1dc1ba1414
commit ee0f0da69b
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/kernel32/tests/volume.c
View File

@ -324,7 +324,6 @@ static void test_GetVolumeInformationA(void)
ok(ret, "SetCurrentDirectory: error %d\n", GetLastError()); ok(ret, "SetCurrentDirectory: error %d\n", GetLastError());
ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL,
NULL, NULL, fs_name_buf, fs_name_len); NULL, NULL, fs_name_buf, fs_name_len);
todo_wine
ok(ret, "GetVolumeInformationA root failed, last error %u\n", GetLastError()); ok(ret, "GetVolumeInformationA root failed, last error %u\n", GetLastError());
/* check for error on no trailing \ when current dir is subdir (windows) of queried drive */ /* check for error on no trailing \ when current dir is subdir (windows) of queried drive */
@ -392,7 +391,7 @@ static void test_GetVolumeInformationA(void)
/* \ is current on root drive, call succeeds */ /* \ is current on root drive, call succeeds */
ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL,
NULL, NULL, fs_name_buf, fs_name_len); NULL, NULL, fs_name_buf, fs_name_len);
todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError());
/* again, SetCurrentDirectory on another drive does not matter */ /* again, SetCurrentDirectory on another drive does not matter */
ret = SetCurrentDirectory(Root_Slash); ret = SetCurrentDirectory(Root_Slash);
@ -403,7 +402,7 @@ static void test_GetVolumeInformationA(void)
/* \ is current on root drive, call succeeds */ /* \ is current on root drive, call succeeds */
ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL, ret = pGetVolumeInformationA(Root_Colon, vol_name_buf, vol_name_size, NULL,
NULL, NULL, fs_name_buf, fs_name_len); NULL, NULL, fs_name_buf, fs_name_len);
todo_wine ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError()); ok(ret, "GetVolumeInformationA failed, last error %u\n", GetLastError());
} }
/* try null root directory to return "root of the current directory" */ /* try null root directory to return "root of the current directory" */
@ -420,7 +419,7 @@ static void test_GetVolumeInformationA(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size,
&vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len);
todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH),
"GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError());
/* try again with device name space */ /* try again with device name space */
@ -428,7 +427,7 @@ static void test_GetVolumeInformationA(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size, ret = pGetVolumeInformationA(Root_UNC, vol_name_buf, vol_name_size,
&vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len);
todo_wine ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH), ok(ret || broken(!ret /* win9x */ && GetLastError()==ERROR_BAD_NETPATH),
"GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError()); "GetVolumeInformationA did%s fail, root=%s, last error=%u\n", ret ? " not":"", Root_UNC, GetLastError());
/* try again with a directory off the root - should generate error */ /* try again with a directory off the root - should generate error */

35
dlls/kernel32/volume.c
View File

@ -513,26 +513,29 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len,
static const WCHAR fat32W[] = {'F','A','T','3','2',0}; static const WCHAR fat32W[] = {'F','A','T','3','2',0};
static const WCHAR ntfsW[] = {'N','T','F','S',0}; static const WCHAR ntfsW[] = {'N','T','F','S',0};
static const WCHAR cdfsW[] = {'C','D','F','S',0}; static const WCHAR cdfsW[] = {'C','D','F','S',0};
static const WCHAR default_rootW[] = {'\\',0};
WCHAR device[] = {'\\','\\','.','\\','A',':',0}; WCHAR device[] = {'\\','\\','.','\\','A',':',0};
HANDLE handle; HANDLE handle;
UNICODE_STRING nt_name;
WCHAR *p;
enum fs_type type = FS_UNKNOWN; enum fs_type type = FS_UNKNOWN;
BOOL ret = FALSE;
if (!root) if (!root) root = default_rootW;
if (!RtlDosPathNameToNtPathName_U( root, &nt_name, NULL, NULL ))
{ {
WCHAR path[MAX_PATH]; SetLastError( ERROR_PATH_NOT_FOUND );
GetCurrentDirectoryW( MAX_PATH, path ); return FALSE;
device[4] = path[0];
} }
else /* there must be exactly one backslash in the name, at the end */
p = memchrW( nt_name.Buffer + 4, '\\', (nt_name.Length - 4) / sizeof(WCHAR) );
if (p != nt_name.Buffer + nt_name.Length / sizeof(WCHAR) - 1)
{ {
if (!root[0] || root[1] != ':' || root[lstrlenW(root)-1] != '\\' ) SetLastError( ERROR_INVALID_NAME );
{ goto done;
SetLastError( ERROR_INVALID_NAME );
return FALSE;
}
device[4] = root[0];
} }
device[4] = nt_name.Buffer[4];
/* try to open the device */ /* try to open the device */
@ -566,7 +569,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len,
} }
CloseHandle( handle ); CloseHandle( handle );
TRACE( "%s: found fs type %d\n", debugstr_w(device), type ); TRACE( "%s: found fs type %d\n", debugstr_w(device), type );
if (type == FS_ERROR) return FALSE; if (type == FS_ERROR) goto done;
if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len ); if (label && label_len) VOLUME_GetSuperblockLabel( device, type, superblock, label, label_len );
if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock ); if (serial) *serial = VOLUME_GetSuperblockSerial( device, type, superblock );
@ -581,7 +584,7 @@ BOOL WINAPI GetVolumeInformationW( LPCWSTR root, LPWSTR label, DWORD label_len,
case DRIVE_UNKNOWN: case DRIVE_UNKNOWN:
case DRIVE_NO_ROOT_DIR: case DRIVE_NO_ROOT_DIR:
SetLastError( ERROR_NOT_READY ); SetLastError( ERROR_NOT_READY );
return FALSE; goto done;
case DRIVE_REMOVABLE: case DRIVE_REMOVABLE:
case DRIVE_FIXED: case DRIVE_FIXED:
case DRIVE_REMOTE: case DRIVE_REMOTE:
@ -618,7 +621,11 @@ fill_fs_info: /* now fill in the information that depends on the file system ty
if (flags) *flags = FILE_CASE_PRESERVED_NAMES; if (flags) *flags = FILE_CASE_PRESERVED_NAMES;
break; break;
} }
return TRUE; ret = TRUE;
done:
RtlFreeUnicodeString( &nt_name );
return ret;
} }