X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Fvolume_id%2Fvol_id.c;h=0427d70da199e312e518c5e48792350de9cc4e26;hp=dcf56d87e9fb4562c1fe3f54de8075232637795c;hb=e18e6d79996edeeb07e122f3582a688c3ef4f6b9;hpb=3d6d12c6b17e6ea84112bd3a7aac19d8b614fc1c diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index dcf56d87e..0427d70da 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -27,6 +27,8 @@ #include #include #include +#include +#include #include #include @@ -109,25 +111,32 @@ static void set_str(char *to, const char *from, size_t count) int main(int argc, char *argv[]) { - const char help[] = "usage: vol_id [--export|-t|-l|-u] \n" - " --export\n" - " -t filesystem type\n" - " -l filesystem label\n" - " -u filesystem uuid\n" + const char help[] = "Usage: vol_id [options] \n" + " --export export key/value pairs\n" + " -t filesystem type\n" + " -l filesystem label\n" + " -u filesystem uuid\n" + " -L raw label\n" + " --skip-raid don't probe for raid\n" + " --probe-all find possibly conflicting signatures\n" + " --help\n" "\n"; enum print_type { PRINT_EXPORT, PRINT_TYPE, PRINT_LABEL, PRINT_UUID, + PRINT_RAW_LABEL, } print = PRINT_EXPORT; struct volume_id *vid = NULL; static char name[VOLUME_ID_LABEL_SIZE]; int i; uint64_t size; + int skip_raid = 0; + int probe_all = 0; const char *node = NULL; - uid_t nobody_uid; - gid_t nobody_gid; + struct passwd *pw; + int retval; int rc = 0; logging_init("vol_id"); @@ -146,6 +155,15 @@ int main(int argc, char *argv[]) print = PRINT_LABEL; } else if (strcmp(arg, "-u") == 0) { print = PRINT_UUID; + } else if (strcmp(arg, "-L") == 0) { + print = PRINT_RAW_LABEL; + } else if (strcmp(arg, "--skip-raid") == 0) { + skip_raid = 1; + } else if (strcmp(arg, "--probe-all") == 0) { + probe_all = 1; + } else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) { + printf(help); + goto exit; } else node = arg; } @@ -165,29 +183,105 @@ int main(int argc, char *argv[]) if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0) size = 0; - dbg("BLKGETSIZE64=%llu", size); + dbg("BLKGETSIZE64=%llu", (unsigned long long)size); - /* drop all privileges */ - nobody_uid = lookup_user("nobody"); - nobody_gid = lookup_group("nogroup"); - if (nobody_uid > 0 && nobody_gid > 0) { + /* try to drop all privileges before reading disk content */ + pw = getpwnam ("nobody"); + if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) { + dbg("dropping privileges to %u:%u", + (unsigned int)pw->pw_uid, (unsigned int)pw->pw_gid); if (setgroups(0, NULL) != 0 || - setgid(nobody_gid) != 0 || - setuid(nobody_uid) != 0) { + setgid(pw->pw_gid) != 0 || + setuid(pw->pw_uid) != 0) { + fprintf(stderr, "error dropping privileges: %s\n", strerror(errno)); rc = 3; goto exit; } } - if (volume_id_probe_all(vid, 0, size) == 0) - goto print; + if (probe_all) { + if (volume_id_probe_linux_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_intel_software_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_lsi_mega_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_via_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_silicon_medley_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_nvidia_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_promise_fasttrack_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_highpoint_45x_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_adaptec_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_jmicron_raid(vid, 0, size) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_vfat(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_linux_swap(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_luks(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_xfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ext(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_reiserfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_jfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_udf(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_iso9660(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_hfs_hfsplus(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ufs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ntfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_cramfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_romfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_hpfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_sysv(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_minix(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ocfs1(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_ocfs2(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_vxfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_squashfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_netware(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_gfs(vid, 0, 0) == 0) + printf("%s\n", vid->type); + if (volume_id_probe_gfs2(vid, 0, 0) == 0) + printf("%s\n", vid->type); - if (print != PRINT_EXPORT) + goto exit; + } + + if (skip_raid) + retval = volume_id_probe_filesystem(vid, 0, size); + else + retval = volume_id_probe_all(vid, 0, size); + if (retval != 0) { fprintf(stderr, "%s: unknown volume type\n", node); - rc = 4; - goto exit; + rc = 4; + goto exit; + } -print: set_str(name, vid->label, sizeof(vid->label)); replace_untrusted_chars(name); @@ -204,20 +298,26 @@ print: printf("%s\n", vid->type); break; case PRINT_LABEL: - if (name[0] == '\0' || - (vid->usage_id != VOLUME_ID_FILESYSTEM && vid->usage_id != VOLUME_ID_DISKLABEL)) { + if (name[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { rc = 3; goto exit; } printf("%s\n", name); break; case PRINT_UUID: - if (vid->uuid[0] == '\0' || vid->usage_id != VOLUME_ID_FILESYSTEM) { + if (vid->uuid[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { rc = 4; goto exit; } printf("%s\n", vid->uuid); break; + case PRINT_RAW_LABEL: + if (vid->label[0] == '\0' || vid->usage_id == VOLUME_ID_RAID) { + rc = 3; + goto exit; + } + printf("%s\n", vid->label); + break; } exit: