ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 03:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: check for non-local files in non-exclusive mode.

Browse Source 
Change-Id: Ibd1bbf48aba42d5ed736069d59b18ac0dd143554
This commit is contained in:
Leonid Yuriev
2018-06-13 21:33:49 +03:00
committed by Leo Yuriev
parent f625b6cb42
commit b57c3b2503
2 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/osal.c
View File

@@ -746,7 +746,7 @@ int mdbx_msync(mdbx_mmap_t *map, size_t offset, size_t length, int async) {
#endif #endif
} }
int mdbx_is_file_local(mdbx_filehandle_t handle, int flags) { int mdbx_check4nonlocal(mdbx_filehandle_t handle, int flags) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)
if (GetFileType(handle) != FILE_TYPE_DISK) if (GetFileType(handle) != FILE_TYPE_DISK)
return ERROR_FILE_OFFLINE; return ERROR_FILE_OFFLINE;
@@ -756,10 +756,13 @@ int mdbx_is_file_local(mdbx_filehandle_t handle, int flags) {
if (mdbx_GetFileInformationByHandleEx(handle, FileRemoteProtocolInfo, if (mdbx_GetFileInformationByHandleEx(handle, FileRemoteProtocolInfo,
&RemoteProtocolInfo, &RemoteProtocolInfo,
sizeof(RemoteProtocolInfo))) { sizeof(RemoteProtocolInfo))) {
if ((RemoteProtocolInfo.Flags & (REMOTE_PROTOCOL_INFO_FLAG_LOOPBACK |
REMOTE_PROTOCOL_INFO_FLAG_OFFLINE)) != if ((RemoteProtocolInfo.Flags & REMOTE_PROTOCOL_INFO_FLAG_OFFLINE) &&
REMOTE_PROTOCOL_INFO_FLAG_LOOPBACK) !(flags & MDBX_RDONLY))
return ERROR_FILE_OFFLINE; return ERROR_FILE_OFFLINE;
if (!(RemoteProtocolInfo.Flags & REMOTE_PROTOCOL_INFO_FLAG_LOOPBACK) &&
!(flags & MDBX_EXCLUSIVE))
return ERROR_REMOTE_STORAGE_MEDIA_ERROR;
} }
} }
@@ -778,10 +781,12 @@ int mdbx_is_file_local(mdbx_filehandle_t handle, int flags) {
FSCTL_GET_EXTERNAL_BACKING, NULL, 0, FSCTL_GET_EXTERNAL_BACKING, NULL, 0,
&GetExternalBacking_OutputBuffer, &GetExternalBacking_OutputBuffer,
sizeof(GetExternalBacking_OutputBuffer)); sizeof(GetExternalBacking_OutputBuffer));
if (rc != STATUS_OBJECT_NOT_EXTERNALLY_BACKED && if (NT_SUCCESS(rc)) {
rc != STATUS_INVALID_DEVICE_REQUEST) if (!(flags & MDBX_EXCLUSIVE))
return NT_SUCCESS(rc) ? ERROR_REMOTE_STORAGE_MEDIA_ERROR return ERROR_REMOTE_STORAGE_MEDIA_ERROR;
: ntstatus2errcode(rc); } else if (rc != STATUS_OBJECT_NOT_EXTERNALLY_BACKED &&
rc != STATUS_INVALID_DEVICE_REQUEST)
return ntstatus2errcode(rc);
} }
if (mdbx_GetVolumeInformationByHandleW && mdbx_GetFinalPathNameByHandleW) { if (mdbx_GetVolumeInformationByHandleW && mdbx_GetFinalPathNameByHandleW) {
@@ -802,12 +807,12 @@ int mdbx_is_file_local(mdbx_filehandle_t handle, int flags) {
FILE_NAME_NORMALIZED | VOLUME_NAME_NT)) FILE_NAME_NORMALIZED | VOLUME_NAME_NT))
return GetLastError(); return GetLastError();
if (_wcsnicmp(PathBuffer, L"\\Device\\Mup\\", 12) == 0) if (_wcsnicmp(PathBuffer, L"\\Device\\Mup\\", 12) == 0) {
return ERROR_REMOTE_STORAGE_MEDIA_ERROR; if (!(flags & MDBX_EXCLUSIVE))
return ERROR_REMOTE_STORAGE_MEDIA_ERROR;
if (mdbx_GetFinalPathNameByHandleW(handle, PathBuffer, INT16_MAX, } else if (mdbx_GetFinalPathNameByHandleW(handle, PathBuffer, INT16_MAX,
FILE_NAME_NORMALIZED | FILE_NAME_NORMALIZED |
VOLUME_NAME_DOS)) { VOLUME_NAME_DOS)) {
UINT DriveType = GetDriveTypeW(PathBuffer); UINT DriveType = GetDriveTypeW(PathBuffer);
if (DriveType == DRIVE_NO_ROOT_DIR && if (DriveType == DRIVE_NO_ROOT_DIR &&
wcsncmp(PathBuffer, L"\\\\?\\", 4) == 0 && wcsncmp(PathBuffer, L"\\\\?\\", 4) == 0 &&
@@ -824,7 +829,9 @@ int mdbx_is_file_local(mdbx_filehandle_t handle, int flags) {
case DRIVE_NO_ROOT_DIR: case DRIVE_NO_ROOT_DIR:
case DRIVE_REMOTE: case DRIVE_REMOTE:
default: default:
return ERROR_REMOTE_STORAGE_MEDIA_ERROR; if (!(flags & MDBX_EXCLUSIVE))
return ERROR_REMOTE_STORAGE_MEDIA_ERROR;
// fall through
case DRIVE_REMOVABLE: case DRIVE_REMOVABLE:
case DRIVE_FIXED: case DRIVE_FIXED:
case DRIVE_RAMDISK: case DRIVE_RAMDISK:
@@ -848,7 +855,7 @@ int mdbx_mmap(int flags, mdbx_mmap_t *map, size_t size, size_t limit) {
map->section = NULL; map->section = NULL;
map->address = nullptr; map->address = nullptr;
NTSTATUS rc = mdbx_is_file_local(map->fd, flags); NTSTATUS rc = mdbx_check4nonlocal(map->fd, flags);
if (rc != MDBX_SUCCESS) if (rc != MDBX_SUCCESS)
return rc; return rc;

2
src/osal.h
View File

@@ -510,7 +510,7 @@ int mdbx_suspend_threads_before_remap(MDBX_env *env,
int mdbx_resume_threads_after_remap(mdbx_handle_array_t *array); int mdbx_resume_threads_after_remap(mdbx_handle_array_t *array);
#endif /* Windows */ #endif /* Windows */
int mdbx_msync(mdbx_mmap_t *map, size_t offset, size_t length, int async); int mdbx_msync(mdbx_mmap_t *map, size_t offset, size_t length, int async);
int mdbx_is_file_local(mdbx_filehandle_t handle, int flags); int mdbx_check4nonlocal(mdbx_filehandle_t handle, int flags);
static __inline mdbx_pid_t mdbx_getpid(void) { static __inline mdbx_pid_t mdbx_getpid(void) {
#if defined(_WIN32) || defined(_WIN64) #if defined(_WIN32) || defined(_WIN64)