AuxXxilium/eudev
1
0
Fork 0
mirror of https://github.com/AuxXxilium/eudev.git synced 2025-02-23 02:30:27 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

volume_id: always check for all filesystem types and skip conflicting results

Browse Source 
We probe for all known filesystems to find conflicting signatures. If
we find multiple matching signatures and one of the detected filesystem
types claims that it can not co-exist with any other filesystem type,
we do not return a probing result.

We can not afford to mount a volume with the wrong filesystem code and
possibly corrupt it. Linux ssytems have the problem of dozens of possible
filesystem types, and volumes with left-over signatures from former
filesystem types. Invalid signature need to be removed from the volume
to make the filesystem detection successful.

We do not want to read that many bytes from probed floppies, skip volumes
smaller than a usual floppy disk.
This commit is contained in:
Kay Sievers 2008-11-13 19:34:41 +01:00
parent 90dca5ff9d
commit 779d2d851e
4 changed files with 53 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extras/volume_id/lib/fat.c
View File

@ -497,6 +497,7 @@ fat32:
found:
volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
id->type = "vfat";
/* we think this is fat, but we make sure no other signatures are found */
id->force_unique_result = 1;
return 0;
}

1
extras/volume_id/lib/libvolume_id-private.h
View File

@ -120,6 +120,7 @@ struct volume_id {
uint8_t *seekbuf;
uint64_t seekbuf_off;
size_t seekbuf_len;
int force_unique_result;
};
/* utils */

2
extras/volume_id/lib/linux_swap.c
View File

@ -97,5 +97,7 @@ found_label:
found:
volume_id_set_usage(id, VOLUME_ID_OTHER);
/* we think this is swap, but we make sure no other signatures are found */
id->force_unique_result = 1;
return 0;
}

54
extras/volume_id/lib/volume_id.c
View File

@ -369,9 +369,12 @@ int volume_id_probe_raid(struct volume_id *id, uint64_t off, uint64_t size)
info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
for (i = 0; i < ARRAY_SIZE(prober_raid); i++)
if (prober_raid[i].prober(id, off, size) == 0)
for (i = 0; i < ARRAY_SIZE(prober_raid); i++) {
if (prober_raid[i].prober(id, off, size) == 0) {
info("signature '%s' detected\n", id->type);
goto found;
}
}
return -1;
found:
@ -402,11 +405,50 @@ int volume_id_probe_filesystem(struct volume_id *id, uint64_t off, uint64_t size
info("probing at offset 0x%" PRIx64 ", size 0x%" PRIx64 "\n", off, size);
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++)
if (prober_filesystem[i].prober(id, off, size) == 0)
goto found;
return -1;
/*
* We probe for all known filesystems to find conflicting signatures. If
* we find multiple matching signatures and one of the detected filesystem
* types claims that it can not co-exist with any other filesystem type,
* we do not return a probing result.
*
* We can not afford to mount a volume with the wrong filesystem code and
* possibly corrupt it. Linux ssytems have the problem of dozens of possible
* filesystem types, and volumes with left-over signatures from former
* filesystem types. Invalid signature need to be removed from the volume
* to make the filesystem detection successful.
*
* We do not want to read that many bytes from probed floppies, skip volumes
* smaller than a usual floppy disk
*/
if (size > 1440 * 1024) {
int found = 0;
int force_unique_result = 0;
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++) {
int match;
match = (prober_filesystem[i].prober(id, off, size) == 0);
if (match) {
info("signature '%s' detected\n", id->type);
if (id->force_unique_result)
force_unique_result = id->force_unique_result;
if (found && force_unique_result) {
info("conflicting signatures found, skip results\n");
return -1;
}
found = 1;
}
}
}
/* return the first match */
for (i = 0; i < ARRAY_SIZE(prober_filesystem); i++) {
if (prober_filesystem[i].prober(id, off, size) == 0) {
info("signature '%s' detected\n", id->type);
goto found;
}
}
return -1;
found:
/* If recognized, we free the allocated buffers */
volume_id_free_buffer(id);