2 files changed, 11 insertions, 1 deletions
diff --git a/src/Platform/Unix/File.cpp b/src/Platform/Unix/File.cpp
index d3413800..207efb4e 100644
--- a/src/Platform/Unix/File.cpp
+++ b/src/Platform/Unix/File.cpp
@@ -222,6 +222,17 @@ namespace VeraCrypt
 #	endif
 		}
 #endif
+#ifdef TC_LINUX
+		// On Linux, try to use BLKGETSIZE64 for devices
+		if (Path.IsDevice())
+		{
+			uint64 mediaSize;
+			if (ioctl (FileHandle, BLKGETSIZE64, &mediaSize) != -1)
+			{
+				return mediaSize;
+			}
+		}
+#endif
 		off_t current = lseek (FileHandle, 0, SEEK_CUR);
 		throw_sys_sub_if (current == -1, wstring (Path));
 		SeekEnd (0);
diff --git a/src/Platform/Unix/Process.cpp b/src/Platform/Unix/Process.cpp
index d148a686..36b01e6b 100644
--- a/src/Platform/Unix/Process.cpp
+++ b/src/Platform/Unix/Process.cpp
@@ -119,7 +119,6 @@ namespace VeraCrypt
 		throw_sys_if (fcntl (exceptionPipe.GetReadFD(), F_SETFL, O_NONBLOCK) == -1);
 
 		vector <char> buffer (4096), stdOutput (4096), errOutput (4096), exOutput (4096);
-		buffer.clear ();
 		stdOutput.clear ();
 		errOutput.clear ();
 		exOutput.clear ();