#include <sys/types.h>
#include "udev.h"
+#include "udev_selinux.h"
static size_t devpath_to_db_path(const char *devpath, char *filename, size_t len)
{
size_t start;
- /* add location of db files */
+ /* translate to location of db file */
strlcpy(filename, udev_root, len);
start = strlcat(filename, "/"DB_DIR"/", len);
strlcat(filename, devpath, len);
strlcat(filename, device, sizeof(filename));
if (add) {
- info("creating index: '%s'", filename);
+ info("creating index: '%s'\n", filename);
create_path(filename);
fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
if (fd > 0)
close(fd);
} else {
- info("removing index: '%s'", filename);
+ info("removing index: '%s'\n", filename);
unlink(filename);
delete_path(filename);
}
dir = opendir(dirname);
if (dir == NULL) {
- info("no index directory '%s': %s", dirname, strerror(errno));
+ info("no index directory '%s': %s\n", dirname, strerror(errno));
rc = -1;
goto out;
}
- info("found index directory '%s'", dirname);
+ info("found index directory '%s'\n", dirname);
while (1) {
struct dirent *ent;
char device[PATH_SIZE];
return rc;
}
+int udev_db_rename(const char *devpath_old, const char *devpath)
+{
+ char filename[PATH_SIZE];
+ char filename_old[PATH_SIZE];
+
+ devpath_to_db_path(devpath_old, filename_old, sizeof(filename_old));
+ devpath_to_db_path(devpath, filename, sizeof(filename));
+ return rename(filename_old, filename);
+}
+
int udev_db_add_device(struct udevice *udev)
{
char filename[PATH_SIZE];
*/
if (list_empty(&udev->symlink_list) && list_empty(&udev->env_list) &&
!udev->partitions && !udev->ignore_remove) {
- dbg("nothing interesting to store, create symlink");
- if (symlink(udev->name, filename) != 0) {
- err("unable to create db link '%s': %s", filename, strerror(errno));
+ int ret;
+ dbg("nothing interesting to store, create symlink\n");
+ selinux_setfscreatecon(filename, NULL, S_IFLNK);
+ ret = symlink(udev->name, filename);
+ selinux_resetfscreatecon();
+ if (ret != 0) {
+ err("unable to create db link '%s': %s\n", filename, strerror(errno));
return -1;
}
} else {
f = fopen(filename, "w");
if (f == NULL) {
- err("unable to create db file '%s': %s", filename, strerror(errno));
+ err("unable to create db file '%s': %s\n", filename, strerror(errno));
return -1;
}
- dbg("storing data for device '%s' in '%s'", udev->dev->devpath, filename);
+ dbg("storing data for device '%s' in '%s'\n", udev->dev->devpath, filename);
fprintf(f, "N:%s\n", udev->name);
list_for_each_entry(name_loop, &udev->symlink_list, node) {
name_index(udev->dev->devpath, name_loop->name, 1);
}
fprintf(f, "M:%u:%u\n", major(udev->devt), minor(udev->devt));
- if (udev->link_priority)
+ if (udev->link_priority != 0)
fprintf(f, "L:%u\n", udev->link_priority);
- if (udev->partitions)
+ if (udev->event_timeout >= 0)
+ fprintf(f, "T:%u\n", udev->event_timeout);
+ if (udev->partitions != 0)
fprintf(f, "A:%u\n", udev->partitions);
if (udev->ignore_remove)
fprintf(f, "R:%u\n", udev->ignore_remove);
size_t cur;
size_t count;
- strlcpy(udev->dev->devpath, devpath, sizeof(udev->dev->devpath));
+ sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
devpath_to_db_path(devpath, filename, sizeof(filename));
if (lstat(filename, &stats) != 0) {
- info("no db file to read %s: %s", filename, strerror(errno));
+ info("no db file to read %s: %s\n", filename, strerror(errno));
return -1;
}
if ((stats.st_mode & S_IFMT) == S_IFLNK) {
char target[NAME_SIZE];
int target_len;
- info("found a symlink as db file");
+ info("found a symlink as db file\n");
target_len = readlink(filename, target, sizeof(target));
if (target_len > 0)
target[target_len] = '\0';
else {
- info("error reading db link %s: %s", filename, strerror(errno));
+ info("error reading db link %s: %s\n", filename, strerror(errno));
return -1;
}
- dbg("db link points to '%s'", target);
+ dbg("db link points to '%s'\n", target);
strlcpy(udev->name, target, sizeof(udev->name));
return 0;
}
if (file_map(filename, &buf, &bufsize) != 0) {
- info("error reading db file %s: %s", filename, strerror(errno));
+ info("error reading db file %s: %s\n", filename, strerror(errno));
return -1;
}
bufline = &buf[cur];
cur += count+1;
+ if (count > sizeof(line))
+ count = sizeof(line);
+ memcpy(line, &bufline[2], count-2);
+ line[count-2] = '\0';
+
switch(bufline[0]) {
case 'N':
- if (count > sizeof(udev->name))
- count = sizeof(udev->name);
- memcpy(udev->name, &bufline[2], count-2);
- udev->name[count-2] = '\0';
+ strlcpy(udev->name, line, sizeof(udev->name));
break;
case 'M':
- if (count > sizeof(line))
- count = sizeof(line);
- memcpy(line, &bufline[2], count-2);
- line[count-2] = '\0';
sscanf(line, "%u:%u", &maj, &min);
udev->devt = makedev(maj, min);
break;
case 'S':
- if (count > sizeof(line))
- count = sizeof(line);
- memcpy(line, &bufline[2], count-2);
- line[count-2] = '\0';
name_list_add(&udev->symlink_list, line, 0);
break;
case 'L':
- if (count > sizeof(line))
- count = sizeof(line);
- memcpy(line, &bufline[2], count-2);
- line[count-2] = '\0';
udev->link_priority = atoi(line);
break;
+ case 'T':
+ udev->event_timeout = atoi(line);
+ break;
case 'A':
- if (count > sizeof(line))
- count = sizeof(line);
- memcpy(line, &bufline[2], count-2);
- line[count-2] = '\0';
udev->partitions = atoi(line);
break;
case 'R':
- if (count > sizeof(line))
- count = sizeof(line);
- memcpy(line, &bufline[2], count-2);
- line[count-2] = '\0';
udev->ignore_remove = atoi(line);
break;
case 'E':
- if (count > sizeof(line))
- count = sizeof(line);
- memcpy(line, &bufline[2], count-2);
- line[count-2] = '\0';
name_list_add(&udev->env_list, line, 0);
break;
}
strlcat(dbpath, "/"DB_DIR, sizeof(dbpath));
dir = opendir(dbpath);
if (dir == NULL) {
- info("no udev_db available '%s': %s", dbpath, strerror(errno));
+ info("no udev_db available '%s': %s\n", dbpath, strerror(errno));
return -1;
}
strlcpy(device, ent->d_name, sizeof(device));
path_decode(device);
name_list_add(name_list, device, 1);
- dbg("added '%s'", device);
+ dbg("added '%s'\n", device);
}
closedir(dir);
~ianmdlvl / elogind.git / blobdiff