chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
077 release
[elogind.git]
/
udev_add.c
diff --git
a/udev_add.c
b/udev_add.c
index e5bd042a5c41bec14cb28b2f76ba03e83e998fff..128917e519db9457720fdca27c15ebc9ca32a76c 100644
(file)
--- a/
udev_add.c
+++ b/
udev_add.c
@@
-1,10
+1,8
@@
/*
* udev-add.c
*
/*
* udev-add.c
*
- * Userspace devfs
- *
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
* Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
- *
+ *
Copyright (C) 2004 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
*
* 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
@@
-34,16
+32,14
@@
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <linux/sockios.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <linux/sockios.h>
-#include <pwd.h>
#include "libsysfs/sysfs/libsysfs.h"
#include "libsysfs/sysfs/libsysfs.h"
+#include "udev_libc_wrapper.h"
#include "udev.h"
#include "udev_utils.h"
#include "udev.h"
#include "udev_utils.h"
-#include "udev_sysfs.h"
#include "udev_version.h"
#include "logging.h"
#include "udev_version.h"
#include "logging.h"
-#include "namedev.h"
-#include "udev_db.h"
+#include "udev_rules.h"
#include "udev_selinux.h"
#include "udev_selinux.h"
@@
-52,40
+48,39
@@
int udev_make_node(struct udevice *udev, const char *file, dev_t devt, mode_t mo
struct stat stats;
int retval = 0;
struct stat stats;
int retval = 0;
+ switch (udev->type) {
+ case DEV_BLOCK:
+ mode |= S_IFBLK;
+ break;
+ case DEV_CLASS:
+ mode |= S_IFCHR;
+ break;
+ default:
+ dbg("unknown node type %c\n", udev->type);
+ return -EINVAL;
+ }
+
if (stat(file, &stats) != 0)
goto create;
/* preserve node with already correct numbers, to not change the inode number */
if (stat(file, &stats) != 0)
goto create;
/* 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);
+ if ((stats.st_mode & S_IFMT) == (mode & S_IFMT) && (stats.st_rdev == devt)) {
+ info("preserve file '%s', cause it has correct dev_t", file);
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
if (unlink(file) != 0)
selinux_setfilecon(file, udev->kernel_name, stats.st_mode);
goto perms;
}
if (unlink(file) != 0)
-
dbg("unlink(%s) failed with error '%s'
", file, strerror(errno));
+
err("unlink(%s) failed: %s
", file, strerror(errno));
else
dbg("already present file '%s' unlinked", file);
create:
else
dbg("already present file '%s' unlinked", file);
create:
- switch (udev->type) {
- case BLOCK:
- mode |= S_IFBLK;
- break;
- case CLASS:
- mode |= S_IFCHR;
- break;
- default:
- dbg("unknown node type %c\n", udev->type);
- return -EINVAL;
- }
-
selinux_setfscreatecon(file, udev->kernel_name, mode);
retval = mknod(file, mode, devt);
selinux_resetfscreatecon();
if (retval != 0) {
selinux_setfscreatecon(file, udev->kernel_name, mode);
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: %s
",
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
file, mode, major(devt), minor(devt), strerror(errno));
goto exit;
}
@@
-93,14
+88,14
@@
create:
perms:
dbg("chmod(%s, %#o)", file, mode);
if (chmod(file, mode) != 0) {
perms:
dbg("chmod(%s, %#o)", file, mode);
if (chmod(file, mode) != 0) {
-
dbg("chmod(%s, %#o) failed with error '%s'
", file, mode, strerror(errno));
+
err("chmod(%s, %#o) failed: %s
", file, mode, strerror(errno));
goto exit;
}
if (uid != 0 || gid != 0) {
dbg("chown(%s, %u, %u)", file, uid, gid);
if (chown(file, uid, gid) != 0) {
goto exit;
}
if (uid != 0 || gid != 0) {
dbg("chown(%s, %u, %u)", file, uid, gid);
if (chown(file, uid, gid) != 0) {
-
dbg("chown(%s, %u, %u) failed with error '%s'
",
+
err("chown(%s, %u, %u) failed: %s
",
file, uid, gid, strerror(errno));
goto exit;
}
file, uid, gid, strerror(errno));
goto exit;
}
@@
-112,52
+107,45
@@
exit:
static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
{
static int create_node(struct udevice *udev, struct sysfs_class_device *class_dev)
{
- char filename[NAME_SIZE];
- char partitionname[NAME_SIZE];
- uid_t uid = 0;
- gid_t gid = 0;
+ char filename[PATH_SIZE];
+ char partitionname[PATH_SIZE];
+ struct name_entry *name_loop;
+ uid_t uid;
+ gid_t gid;
int tail;
int tail;
- char *pos;
- int len;
- int i;
+ int i;
- snprintf(filename,
NAME_SIZE
, "%s/%s", udev_root, udev->name);
- filename[
NAME_SIZE
-1] = '\0';
+ snprintf(filename,
sizeof(filename)
, "%s/%s", udev_root, udev->name);
+ filename[
sizeof(filename)
-1] = '\0';
/* create parent directories if needed */
if (strchr(udev->name, '/'))
create_path(filename);
/* create parent directories if needed */
if (strchr(udev->name, '/'))
create_path(filename);
- if (udev->owner[0] != '\0') {
+ if (strcmp(udev->owner, "root") == 0)
+ uid = 0;
+ else {
char *endptr;
char *endptr;
- unsigned long id
= strtoul(udev->owner, &endptr, 10)
;
+ unsigned long id;
+ id = strtoul(udev->owner, &endptr, 10);
if (endptr[0] == '\0')
uid = (uid_t) id;
if (endptr[0] == '\0')
uid = (uid_t) id;
- else {
- struct passwd *pw;
-
- pw = getpwnam(udev->owner);
- if (pw == NULL)
- dbg("specified user unknown '%s'", udev->owner);
- else
- uid = pw->pw_uid;
- }
+ else
+ uid = lookup_user(udev->owner);
}
}
- if (udev->group[0] != '\0') {
+ if (strcmp(udev->group, "root") == 0)
+ gid = 0;
+ else {
char *endptr;
char *endptr;
- unsigned long id
= strtoul(udev->group, &endptr, 10)
;
+ unsigned long id;
+ id = strtoul(udev->group, &endptr, 10);
if (endptr[0] == '\0')
gid = (gid_t) id;
if (endptr[0] == '\0')
gid = (gid_t) id;
- else {
- struct group *gr = getgrnam(udev->group);
- if (gr == NULL)
- dbg("specified group unknown '%s'", udev->group);
- else
- gid = gr->gr_gid;
- }
+ else
+ gid = lookup_group(udev->group);
}
if (!udev->test_run) {
}
if (!udev->test_run) {
@@
-187,54
+175,52
@@
static int create_node(struct udevice *udev, struct sysfs_class_device *class_de
for (i = 1; i <= udev->partitions; i++) {
dev_t part_devt;
for (i = 1; i <= udev->partitions; i++) {
dev_t part_devt;
- s
trfieldcpy(partitionname, filename
);
-
strintcat(partitionname, i)
;
- part_devt = makedev(major(udev->devt), minor(udev->devt)
+1
);
+ s
nprintf(partitionname, sizeof(partitionname), "%s%d", filename, i
);
+
partitionname[sizeof(partitionname)-1] = '\0'
;
+ part_devt = makedev(major(udev->devt), minor(udev->devt)
+ i
);
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
}
/* create symlink(s) if requested */
udev_make_node(udev, partitionname, part_devt, udev->mode, uid, gid);
}
}
}
/* create symlink(s) if requested */
-
foreach_strpart(udev->symlink, " ", pos, len
) {
+
list_for_each_entry(name_loop, &udev->symlink_list, node
) {
int retval;
int retval;
- char linkname[NAME_SIZE];
- char linktarget[NAME_SIZE];
+ char linktarget[PATH_SIZE];
- strfieldcpymax(linkname, pos, len+1);
- snprintf(filename, NAME_SIZE, "%s/%s", udev_root, linkname);
- filename[NAME_SIZE-1] = '\0';
+ snprintf(filename, sizeof(filename), "%s/%s", udev_root, name_loop->name);
+ filename[sizeof(filename)-1] = '\0';
dbg("symlink '%s' to node '%s' requested", filename, udev->name);
if (!udev->test_run)
dbg("symlink '%s' to node '%s' requested", filename, udev->name);
if (!udev->test_run)
- if (str
rchr(link
name, '/'))
+ if (str
chr(file
name, '/'))
create_path(filename);
/* optimize relative link */
linktarget[0] = '\0';
i = 0;
tail = 0;
create_path(filename);
/* optimize relative link */
linktarget[0] = '\0';
i = 0;
tail = 0;
- while (
(udev->name[i] == linkname[i]) && udev->name[i]
) {
+ while (
udev->name[i] && (udev->name[i] == name_loop->name[i])
) {
if (udev->name[i] == '/')
tail = i+1;
i++;
}
if (udev->name[i] == '/')
tail = i+1;
i++;
}
- while (
link
name[i] != '\0') {
- if (
link
name[i] == '/')
- str
fieldcat(linktarget, "../"
);
+ while (
name_loop->
name[i] != '\0') {
+ if (
name_loop->
name[i] == '/')
+ str
lcat(linktarget, "../", sizeof(linktarget)
);
i++;
}
i++;
}
- str
fieldcat(linktarget, &udev->name[tail]
);
+ str
lcat(linktarget, &udev->name[tail], sizeof(linktarget)
);
-
dbg("symlink(%s, %s)", linktarget, filename
);
+
info("creating symlink '%s' to '%s'", filename, linktarget
);
if (!udev->test_run) {
unlink(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)
-
dbg("symlink(%s, %s) failed with error '%s'
",
+
err("symlink(%s, %s) failed: %s
",
linktarget, filename, strerror(errno));
}
}
linktarget, filename, strerror(errno));
}
}
@@
-250,23
+236,23
@@
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;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
if (udev->test_run)
return 0;
sk = socket(PF_INET, SOCK_DGRAM, 0);
if (sk < 0) {
-
dbg("error opening socket"
);
+
err("error opening socket: %s", strerror(errno)
);
return -1;
}
memset(&ifr, 0x00, sizeof(struct ifreq));
return -1;
}
memset(&ifr, 0x00, sizeof(struct ifreq));
- str
fieldcpy(ifr.ifr_name, udev->kernel_name
);
- str
fieldcpy(ifr.ifr_newname, udev->name
);
+ str
lcpy(ifr.ifr_name, udev->kernel_name, IFNAMSIZ
);
+ str
lcpy(ifr.ifr_newname, udev->name, IFNAMSIZ
);
retval = ioctl(sk, SIOCSIFNAME, &ifr);
if (retval != 0)
retval = ioctl(sk, SIOCSIFNAME, &ifr);
if (retval != 0)
-
dbg("error changing net interface name"
);
+
err("error changing net interface name: %s", strerror(errno)
);
close(sk);
return retval;
close(sk);
return retval;
@@
-277,22
+263,10
@@
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) {
- udev->devt = get_devt(class_dev);
- if (!udev->devt) {
- dbg("no dev-file found, do nothing");
- return 0;
- }
- }
-
- if (namedev_name_device(udev, class_dev) != 0)
- return 0;
-
dbg("adding name='%s'", udev->name);
dbg("adding name='%s'", udev->name);
-
selinux_init();
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;
@@
-302,16
+276,17
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
"remove might not work for custom names");
/* use full path to the environment */
"remove might not work for custom names");
/* use full path to the environment */
- snprintf(udev->devname,
NAME_SIZE
, "%s/%s", udev_root, udev->name);
- udev->devname[
NAME_SIZE
-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);
if (retval != 0)
goto exit;
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->kernel_name) != 0) {
retval = rename_net_if(udev);
if (retval != 0)
goto exit;
+ info("renamed netif to '%s'", udev->name);
/* we've changed the name, now fake the devpath, cause the
* original kernel name sleeps with the fishes and we don't
* get an event from the kernel with the new name
/* we've changed the name, now fake the devpath, cause the
* original kernel name sleeps with the fishes and we don't
* get an event from the kernel with the new name
@@
-319,18
+294,18
@@
int udev_add_device(struct udevice *udev, struct sysfs_class_device *class_dev)
pos = strrchr(udev->devpath, '/');
if (pos != NULL) {
pos[1] = '\0';
pos = strrchr(udev->devpath, '/');
if (pos != NULL) {
pos[1] = '\0';
- strfieldcat(udev->devpath, udev->name);
+ strlcat(udev->devpath, udev->name, sizeof(udev->devpath));
+ strlcpy(udev->kernel_name, udev->name, sizeof(udev->kernel_name));
setenv("DEVPATH", udev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
}
/* use netif name for the environment */
setenv("DEVPATH", udev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
}
/* use netif name for the environment */
- str
fieldcpy(udev->devname, udev->name
);
+ str
lcpy(udev->devname, udev->name, sizeof(udev->devname)
);
}
}
exit:
selinux_exit();
}
}
exit:
selinux_exit();
-
return retval;
}
return retval;
}