chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] selinux: fix handling during creation of symlinks
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index 15c6bf9fbca0ea5f951431c6870f78b2aa213c66..9764cb9bcd6c07aabbe625ca07d8b6ebddde0d78 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-58,7
+58,7
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
/* preserve node with already correct numbers, to not change the inode number */
if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
(stats.st_rdev == devt)) {
/* preserve node with already correct numbers, to not change the inode number */
if (((stats.st_mode & S_IFMT) == S_IFBLK || (stats.st_mode & S_IFMT) == S_IFCHR) &&
(stats.st_rdev == devt)) {
-
dbg
("preserve file '%s', cause it has correct dev_t", file);
+
info
("preserve file '%s', cause it has correct dev_t", file);
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
@@
-85,7
+85,7
@@
create:
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
-
dbg
("mknod(%s, %#o, %u, %u) failed with error '%s'",
+
err
("mknod(%s, %#o, %u, %u) failed with error '%s'",
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
@@
-182,7
+182,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
partitionname[sizeof(partitionname)-1] = '\0';
snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
partitionname[sizeof(partitionname)-1] = '\0';
- part_devt = makedev(major(udev->devt), minor(udev->devt)
+1
);
+ part_devt = makedev(major(udev->devt), minor(udev->devt)
+ i
);
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
@@
-221,7
+221,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
unlink(filename);
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
unlink(filename);
- selinux_setfscreatecon(filename,
udev->kernel_name
, S_IFLNK);
+ selinux_setfscreatecon(filename,
NULL
, S_IFLNK);
retval = symlink(linktarget, filename);
selinux_resetfscreatecon();
if (retval != 0)
retval = symlink(linktarget, filename);
selinux_resetfscreatecon();
if (retval != 0)
@@
-241,7
+241,7
@@
static int rename_net_if(struct udevice *udev)
struct ifreq ifr;
int retval;
struct ifreq ifr;
int retval;
-
dbg
("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
+
info
("changing net interface name from '%s' to '%s'", udev->kernel_name, udev->name);
if (udev->test_run)
return 0;
if (udev->test_run)
return 0;
@@
-276,8
+276,11
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
}
}
}
}
- if (udev_rules_get_name(udev, class_dev) != 0)
+ udev_rules_get_name(udev, class_dev);
+ if (udev->ignore_device) {
+ dbg("device event will be ignored");
return 0;
return 0;
+ }
dbg("adding name='%s'", udev->name);
dbg("adding name='%s'", udev->name);