valentineus/0xFFFF
1
Fork 0
Code Releases Activity

disk: Choose correct partition in disk_open_dev()

Browse Source
This commit is contained in:
Pali Rohár committed 2017-07-06 20:55:41 +02:00
1 parent cda5dc6116
commit 27a55c3367
1 file changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/disk.c
+8 -2
View File
@@ -127,9 +127,15 @@ int disk_open_dev(int maj, int min, int partition, int readonly) {
return -1;
}
memcpy(blkdev+len, "p1", 3);
if ( snprintf(blkdev+len, sizeof(blkdev)-len, "p%d", partition) >= (int)(sizeof(blkdev)-len) ) {
ERROR("Block device name is too long");
return -1;
}
if ( stat(blkdev, &st) != 0 || ! S_ISBLK(st.st_mode) ) {
memcpy(blkdev+len, "1", 2);
if ( snprintf(blkdev+len, sizeof(blkdev)-len, "%d", partition) >= (int)(sizeof(blkdev)-len) ) {
ERROR("Block device name is too long");
return -1;
}
if ( stat(blkdev, &st) != 0 || ! S_ISBLK(st.st_mode) ) {
blkdev[len] = 0;
fd = open(blkdev, O_RDONLY);