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] klibc: version 1.0.4
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index 58f4ee1150584b2dd4e70e0f7eafdecfeec8260c..d0d9eab913b21c4d00671e480d602dc1cadea0f6 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-42,7
+42,7
@@
#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
-#include "
namedev
.h"
+#include "
udev_rules
.h"
#include "udev_db.h"
#include "udev_selinux.h"
#include "udev_db.h"
#include "udev_selinux.h"
@@
-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;
}
@@
-70,10
+70,10
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
create:
switch (udev->type) {
create:
switch (udev->type) {
- case BLOCK:
+ case
DEV_
BLOCK:
mode |= S_IFBLK;
break;
mode |= S_IFBLK;
break;
- case CLASS:
+ case
DEV_
CLASS:
mode |= S_IFCHR;
break;
default:
mode |= S_IFCHR;
break;
default:
@@
-83,8
+83,9
@@
create:
selinux_setfscreatecon(file, udev->kernel_name, mode);
retval = mknod(file, mode, devt);
selinux_setfscreatecon(file, udev->kernel_name, mode);
retval = mknod(file, mode, devt);
+ selinux_resetfscreatecon();
if (retval != 0) {
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;
}
@@
-149,7
+150,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
if (endptr[0] == '\0')
gid = (gid_t) id;
else
if (endptr[0] == '\0')
gid = (gid_t) id;
else
- gid = lookup_
user
(udev->group);
+ gid = lookup_
group
(udev->group);
}
if (!udev->test_run) {
}
if (!udev->test_run) {
@@
-189,6
+190,7
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
/* create symlink(s) if requested */
list_for_each_entry(name_loop, &udev->symlink_list, node) {
/* create symlink(s) if requested */
list_for_each_entry(name_loop, &udev->symlink_list, node) {
+ int retval;
char linktarget[PATH_SIZE];
snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
char linktarget[PATH_SIZE];
snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
@@
-218,9
+220,11
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
dbg("symlink(%s, %s)", linktarget, filename);
if (!udev->test_run) {
- selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
unlink(filename);
unlink(filename);
- if (symlink(linktarget, filename) != 0)
+ selinux_setfscreatecon(filename, udev->kernel_name, S_IFLNK);
+ retval = symlink(linktarget, filename);
+ selinux_resetfscreatecon();
+ if (retval != 0)
dbg("symlink(%s, %s) failed with error '%s'",
linktarget, filename, strerror(errno));
}
dbg("symlink(%s, %s) failed with error '%s'",
linktarget, filename, strerror(errno));
}
@@
-237,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;
@@
-264,7
+268,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
char *pos;
int retval = 0;
char *pos;
int retval = 0;
- if (udev->type ==
BLOCK || udev->type ==
CLASS) {
+ if (udev->type ==
DEV_BLOCK || udev->type == DEV_
CLASS) {
udev->devt = get_devt(class_dev);
if (!udev->devt) {
dbg("no dev-file found, do nothing");
udev->devt = get_devt(class_dev);
if (!udev->devt) {
dbg("no dev-file found, do nothing");
@@
-272,14
+276,14
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
}
}
}
}
- if (
namedev_name_devic
e(udev, class_dev) != 0)
+ if (
udev_rules_get_nam
e(udev, class_dev) != 0)
return 0;
dbg("adding name='%s'", udev->name);
selinux_init();
return 0;
dbg("adding name='%s'", udev->name);
selinux_init();
- if (udev->type ==
BLOCK || udev->type ==
CLASS) {
+ if (udev->type ==
DEV_BLOCK || udev->type == DEV_
CLASS) {
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
retval = create_node(udev, class_dev);
if (retval != 0)
goto exit;
@@
-292,7
+296,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
udev->devname[sizeof(udev->devname)-1] = '\0';
snprintf(udev->devname, sizeof(udev->devname), "%s/%s", udev_root, udev->name);
udev->devname[sizeof(udev->devname)-1] = '\0';
- } else if (udev->type == NET) {
+ } else if (udev->type ==
DEV_
NET) {
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);
@@
-317,7
+321,7
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
}
exit:
}
exit:
- selinux_
restore
();
+ selinux_
exit
();
return retval;
}
return retval;
}