volume_id: update README

[elogind.git] / extras / volume_id / vol_id.c

diff --git a/extras/volume_id/vol_id.c b/extras/volume_id/vol_id.c
index a4a866cfcf6d040e952fd6c0bc6ab8d77ba6fe09..2274550c197305e9d15d573a87ba65b4f7426bf2 100644 (file)
--- 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 <kay.sievers@vrfy.org>
+ * Copyright (C) 2005-2006 Kay Sievers <kay.sievers@vrfy.org>
  *
  *     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,11 @@
 #include <unistd.h>
 #include <string.h>
 #include <ctype.h>
+#include <grp.h>
 #include <sys/ioctl.h>
 
-#include "../../udev_utils.h"
-#include "../../logging.h"
-#include "volume_id/volume_id.h"
+#include "../../udev.h"
+#include "lib/libvolume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
@@ -60,31 +60,46 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-static void set_str(char *to, const unsigned char *from, int count)
+static void vid_log(int priority, const char *file, int line, const char *format, ...)
 {
-       int i, j;
-       int len;
+#ifdef USE_LOG
+       va_list args;
+
+       va_start(args, format);
+       log_message(priority, format, args);
+       va_end(args);
+#endif
+       return;
+}
+
+static void set_str(char *to, const char *from, size_t count)
+{
+       size_t i, j, len;
 
+       /* strip trailing whitespace */
        len = strnlen(from, count);
-       while (isspace(from[len-1]))
+       while (len && isspace(from[len-1]))
                len--;
 
+       /* strip leading whitespace */
        i = 0;
        while (isspace(from[i]) && (i < len))
                i++;
 
        j = 0;
        while (i < len) {
-               switch(from[i]) {
-               case '/':
-                       break;
-               case ' ':
+               /* substitute multiple whitespace */
+               if (isspace(from[i])) {
+                       while (isspace(from[i]))
+                               i++;
                        to[j++] = '_';
-                       break;
-               default:
-                       to[j++] = from[i];
                }
-               i++;
+               /* skip chars */
+               if (from[i] == '/') {
+                       i++;
+                       continue;
+               }
+               to[j++] = from[i++];
        }
        to[j] = '\0';
 }
@@ -106,12 +121,17 @@ int main(int argc, char *argv[])
        struct volume_id *vid = NULL;
        static char name[VOLUME_ID_LABEL_SIZE];
        int i;
-       unsigned long long size;
+       uint64_t size;
        const char *node = NULL;
+       uid_t nobody_uid;
+       gid_t nobody_gid;
        int rc = 0;
 
        logging_init("vol_id");
 
+       /* hook in our debug into libvolume_id */
+       volume_id_log_fn = vid_log;
+
        for (i = 1 ; i < argc; i++) {
                char *arg = argv[i];
 
@@ -142,17 +162,31 @@ int main(int argc, char *argv[])
 
        if (ioctl(vid->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;
+               }
+       }
 
        if (volume_id_probe_all(vid, 0, size) == 0)
                goto print;
 
        if (print != PRINT_EXPORT)
                fprintf(stderr, "%s: unknown volume type\n", node);
-       rc = 3;
+       rc = 4;
        goto exit;
 
 print:
        set_str(name, vid->label, sizeof(vid->label));
+       replace_untrusted_chars(name);
 
        switch (print) {
        case PRINT_EXPORT: