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=04e85abb7f8bd02bd69a59ad09a0d112de0bfe5d;hp=518962c10bd5ddd6b649ef7910ff168ace04cc3d;hb=8b5238670d2e741bc71ae3e79b499682965dc2fd;hpb=2d82e6f0532295798adec25a52a7d70c85ba4bba diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c index 518962c10..04e85abb7 100644 --- a/extras/volume_id/vol_id.c +++ b/extras/volume_id/vol_id.c @@ -1,7 +1,7 @@ /* - * vol_id - udev callout to read filesystem label and uuid + * vol_id - read filesystem label and uuid * - * Copyright (C) 2005 Kay Sievers + * Copyright (C) 2005-2006 Kay Sievers * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -27,11 +27,15 @@ #include #include #include +#include +#include #include +#include +#include #include #include "../../udev.h" -#include "libvolume_id/libvolume_id.h" +#include "lib/libvolume_id.h" #define BLKGETSIZE64 _IOR(0x12,114,size_t) @@ -60,6 +64,21 @@ void log_message(int priority, const char *format, ...) } #endif +static void vid_log(int priority, const char *file, int line, const char *format, ...) +{ +#ifdef USE_LOG + char log_str[1024]; + va_list args; + + va_start(args, format); + vsnprintf(log_str, sizeof(log_str), format, args); + log_str[sizeof(log_str)-1] = '\0'; + log_message(priority, "%s:%i %s", file, line, log_str); + va_end(args); +#endif + return; +} + static void set_str(char *to, const char *from, size_t count) { size_t i, j, len; @@ -92,113 +111,213 @@ static void set_str(char *to, const char *from, size_t count) to[j] = '\0'; } +static int all_probers(volume_id_probe_fn_t probe_fn, + struct volume_id *id, uint64_t off, uint64_t size, + void *data) +{ + const char *type; + + if (probe_fn(id, off, size) == 0) + if (volume_id_get_type(id, &type)) + printf("%s\n", type); + + return 0; +} + 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" - "\n"; + static const struct option options[] = { + { "label", 0, NULL, 'l' }, + { "label-raw", 0, NULL, 'L' }, + { "uuid", 0, NULL, 'u' }, + { "type", 0, NULL, 't' }, + { "export", 0, NULL, 'x' }, + { "skip-raid", 0, NULL, 's' }, + { "probe-all", 0, NULL, 'a' }, + { "offset", 1, NULL, 'o' }, + { "help", 0, NULL, 'h' }, + {} + }; + enum print_type { PRINT_EXPORT, PRINT_TYPE, PRINT_LABEL, PRINT_UUID, + PRINT_LABEL_RAW, } print = PRINT_EXPORT; + struct volume_id *vid = NULL; - static char name[VOLUME_ID_LABEL_SIZE]; - int i; + char label_safe[256]; + char label_enc[256]; + char uuid_enc[256]; uint64_t size; - const char *node = NULL; - uid_t nobody_uid; - gid_t nobody_gid; + int skip_raid = 0; + int probe_all = 0; + uint64_t offset = 0; + const char *node; + int fd; + const char *label, *uuid, *type, *type_version, *usage; + int retval; int rc = 0; logging_init("vol_id"); - for (i = 1 ; i < argc; i++) { - char *arg = argv[i]; + /* hook in our debug into libvolume_id */ + volume_id_log_fn = vid_log; - if (strcmp(arg, "--export") == 0) { - print = PRINT_EXPORT; - } else if (strcmp(arg, "-t") == 0) { - print = PRINT_TYPE; - } else if (strcmp(arg, "-l") == 0) { + while (1) { + int option; + + option = getopt_long(argc, argv, "lLutxsaoh", options, NULL); + if (option == -1) + break; + + switch (option) { + case 'l': print = PRINT_LABEL; - } else if (strcmp(arg, "-u") == 0) { + break; + case 'L': + print = PRINT_LABEL_RAW; + break; + case 'u': print = PRINT_UUID; - } else - node = arg; + break; + case 't': + print = PRINT_TYPE; + break; + case 'x': + print = PRINT_EXPORT; + break; + case 's': + skip_raid = 1; + break; + case 'a': + probe_all = 1; + break; + case 'o': + offset = strtoull(optarg, NULL, 0); + break; + case 'h': + printf("Usage: vol_id [options] \n" + " --export export key/value pairs\n" + " --type filesystem type\n" + " --label filesystem label\n" + " --label-raw raw label\n" + " --uuid filesystem uuid\n" + " --skip-raid don't probe for raid\n" + " --probe-all find possibly conflicting signatures\n" + " --offset skip given number of bytes of input\n" + " --help\n\n"); + goto exit; + default: + retval = 1; + goto exit; + } } + + node = argv[optind]; if (!node) { - err("no node specified"); - fprintf(stderr, help); + err("no device"); + fprintf(stderr, "no device\n"); rc = 1; goto exit; } - vid = volume_id_open_node(node); + fd = open(node, O_RDONLY); + if (fd < 0) { + fprintf(stderr, "%s: error opening volume\n", node); + rc = 2; + goto exit; + } + + vid = volume_id_open_fd(fd); if (vid == NULL) { - fprintf(stderr, "%s: error open volume\n", node); rc = 2; goto exit; } - if (ioctl(vid->fd, BLKGETSIZE64, &size) != 0) + if (ioctl(fd, BLKGETSIZE64, &size) != 0) size = 0; - dbg("BLKGETSIZE64=%llu", size); - - /* drop all privileges */ - nobody_uid = lookup_user("nobody"); - nobody_gid = lookup_group("nogroup"); - if (nobody_uid > 0 && nobody_gid > 0) { - if (setgroups(0, NULL) != 0 || - setgid(nobody_gid) != 0 || - setuid(nobody_uid) != 0) { - rc = 3; - goto exit; + dbg("BLKGETSIZE64=%llu", (unsigned long long)size); + + /* try to drop all privileges before reading disk content */ + if (getuid() == 0) { + struct passwd *pw; + + pw = getpwnam("nobody"); + if (pw != NULL && pw->pw_uid > 0 && pw->pw_gid > 0) { + if (setgroups(0, NULL) != 0 || + setgid(pw->pw_gid) != 0 || + setuid(pw->pw_uid) != 0) + info("unable to drop privileges: %s\n", strerror(errno)); } } - if (volume_id_probe_all(vid, 0, size) == 0) - goto print; + if (probe_all) { + volume_id_all_probers(all_probers, vid, offset, size, NULL); + goto exit; + } - if (print != PRINT_EXPORT) + if (skip_raid) + retval = volume_id_probe_filesystem(vid, offset, size); + else + retval = volume_id_probe_all(vid, offset, size); + if (retval != 0) { fprintf(stderr, "%s: unknown volume type\n", node); - rc = 4; - goto exit; + rc = 4; + goto exit; + } + + if (!volume_id_get_label(vid, &label) || + !volume_id_get_usage(vid, &usage) || + !volume_id_get_type(vid, &type) || + !volume_id_get_type_version(vid, &type_version) || + !volume_id_get_uuid(vid, &uuid)) { + rc = 4; + goto exit; + } -print: - set_str(name, vid->label, sizeof(vid->label)); - replace_untrusted_chars(name); + set_str(label_safe, label, sizeof(label_safe)); + replace_chars(label_safe, ALLOWED_CHARS_INPUT); + + volume_id_encode_string(label, label_enc, sizeof(label_enc)); + volume_id_encode_string(uuid, uuid_enc, sizeof(uuid_enc)); switch (print) { case PRINT_EXPORT: - printf("ID_FS_USAGE=%s\n", vid->usage); - printf("ID_FS_TYPE=%s\n", vid->type); - printf("ID_FS_VERSION=%s\n", vid->type_version); - printf("ID_FS_UUID=%s\n", vid->uuid); - printf("ID_FS_LABEL=%s\n", vid->label); - printf("ID_FS_LABEL_SAFE=%s\n", name); + printf("ID_FS_USAGE=%s\n", usage); + printf("ID_FS_TYPE=%s\n", type); + printf("ID_FS_VERSION=%s\n", type_version); + printf("ID_FS_UUID=%s\n", uuid); + printf("ID_FS_UUID_ENC=%s\n", uuid_enc); + printf("ID_FS_LABEL=%s\n", label); + printf("ID_FS_LABEL_ENC=%s\n", label_enc); + printf("ID_FS_LABEL_SAFE=%s\n", label_safe); break; case PRINT_TYPE: - printf("%s\n", vid->type); + printf("%s\n", type); break; case PRINT_LABEL: - if (name[0] == '\0' || - (vid->usage_id != VOLUME_ID_FILESYSTEM && vid->usage_id != VOLUME_ID_DISKLABEL)) { + if (label_safe[0] == '\0' || strcmp(usage, "raid") == 0) { rc = 3; goto exit; } - printf("%s\n", name); + printf("%s\n", label_safe); break; case PRINT_UUID: - if (vid->uuid[0] == '\0' || vid->usage_id != VOLUME_ID_FILESYSTEM) { + if (uuid_enc[0] == '\0' || strcmp(usage, "raid") == 0) { rc = 4; goto exit; } - printf("%s\n", vid->uuid); + printf("%s\n", uuid_enc); + break; + case PRINT_LABEL_RAW: + if (label[0] == '\0' || strcmp(usage, "raid") == 0) { + rc = 3; + goto exit; + } + printf("%s\n", label); break; }