Export DM_CONTROL_NODE_UMASK and use it while creating /dev/mapper/control.

diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index 697260a1af2adb46a11cac2e4fd71f2ed8026f53..20fe908500f6ad5f82731d42f45c4dc262a0a982 100644 (file)
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,5 +1,6 @@
 Version 1.02.61 - 
 ====================================
+  Export DM_CONTROL_NODE_UMASK and use it while creating /dev/mapper/control.
 
 Version 1.02.60 - 20th December 2010
 ====================================

diff --git a/libdm/ioctl/libdm-iface.c b/libdm/ioctl/libdm-iface.c
index 4a8dfc64fb41a4a415b810b6730438bacb56825a..92c8e9ecd468ab63c9aa2d8cc8fcff42920b0675 100644 (file)
--- a/libdm/ioctl/libdm-iface.c
+++ b/libdm/ioctl/libdm-iface.c
@@ -282,12 +282,14 @@ static int _create_control(const char *control, uint32_t major, uint32_t minor)
        log_verbose("Creating device %s (%u, %u)", control, major, minor);
 
        (void) dm_prepare_selinux_context(control, S_IFCHR);
+       old_umask = umask(DM_CONTROL_NODE_UMASK);
        if (mknod(control, S_IFCHR | S_IRUSR | S_IWUSR,
                  MKDEV(major, minor)) < 0)  {
                log_sys_error("mknod", control);
                (void) dm_prepare_selinux_context(NULL, 0);
                return 0;
        }
+       umask(old_umask);
        (void) dm_prepare_selinux_context(NULL, 0);
 
        return 1;

diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 4aa99910b0c7f44d50ccf3919a4e6c0fa3bfcbdd..994a364f41dd2a3f92792c1d20b9b36a94ec3d26 100644 (file)
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -1219,6 +1219,7 @@ int dm_udev_complete(uint32_t cookie);
 int dm_udev_wait(uint32_t cookie);
 
 #define DM_DEV_DIR_UMASK 0022
+#define DM_CONTROL_NODE_UMASK 0177
 
 #ifdef __cplusplus
 }