SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libudev: devices received from udev are always initialized

Browse Source
This commit is contained in:
Kay Sievers
2013-12-18 17:34:22 +01:00
parent 63966da86d
commit f6613dd959
3 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO
-2
View File
@@ -2,8 +2,6 @@ Bugfixes:
* sort-out libudev's is_initialized logic for:
- enumerate devices:
- is_initialized is true if a database exists
- monitor devices:
- is_initialized is always false; was not supposed to be used here
- in-container devices:
- is_initialized is always false, because there is no database
src/libudev/libudev-device.c
+2
View File
@@ -538,6 +538,8 @@ int udev_device_read_db(struct udev_device *udev_device, const char *dbfile)
udev_dbg(udev_device->udev, "no db file to read %s: %m\n", dbfile);
return -errno;
}
/* devices with a database entry are initialized */
udev_device->is_initialized = true;
while (fgets(line, sizeof(line), f)) {
src/libudev/libudev-monitor.c
+31 -31
View File
@@ -324,9 +324,6 @@ _public_ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
int err = 0;
const int on = 1;
if (udev_monitor->snl.nl.nl_family == 0)
return -EINVAL;
udev_monitor_filter_update(udev_monitor);
if (!udev_monitor->bound) {
@@ -524,7 +521,6 @@ _public_ struct udev_device *udev_monitor_receive_device(struct udev_monitor *ud
char buf[8192];
ssize_t buflen;
ssize_t bufpos;
struct udev_monitor_netlink_header *nlh;
retry:
if (udev_monitor == NULL)
@@ -536,11 +532,8 @@ retry:
smsg.msg_iovlen = 1;
smsg.msg_control = cred_msg;
smsg.msg_controllen = sizeof(cred_msg);
if (udev_monitor->snl.nl.nl_family != 0) {
smsg.msg_name = &snl;
smsg.msg_namelen = sizeof(snl);
}
smsg.msg_name = &snl;
smsg.msg_namelen = sizeof(snl);
buflen = recvmsg(udev_monitor->sock, &smsg, 0);
if (buflen < 0) {
@@ -554,20 +547,18 @@ retry:
return NULL;
}
if (udev_monitor->snl.nl.nl_family != 0) {
if (snl.nl.nl_groups == 0) {
/* unicast message, check if we trust the sender */
if (udev_monitor->snl_trusted_sender.nl.nl_pid == 0 ||
snl.nl.nl_pid != udev_monitor->snl_trusted_sender.nl.nl_pid) {
udev_dbg(udev_monitor->udev, "unicast netlink message ignored\n");
return NULL;
}
} else if (snl.nl.nl_groups == UDEV_MONITOR_KERNEL) {
if (snl.nl.nl_pid > 0) {
udev_dbg(udev_monitor->udev, "multicast kernel netlink message from pid %d ignored\n",
snl.nl.nl_pid);
return NULL;
}
if (snl.nl.nl_groups == 0) {
/* unicast message, check if we trust the sender */
if (udev_monitor->snl_trusted_sender.nl.nl_pid == 0 ||
snl.nl.nl_pid != udev_monitor->snl_trusted_sender.nl.nl_pid) {
udev_dbg(udev_monitor->udev, "unicast netlink message ignored\n");
return NULL;
}
} else if (snl.nl.nl_groups == UDEV_MONITOR_KERNEL) {
if (snl.nl.nl_pid > 0) {
udev_dbg(udev_monitor->udev, "multicast kernel netlink message from pid %d ignored\n",
snl.nl.nl_pid);
return NULL;
}
}
@@ -583,35 +574,47 @@ retry:
return NULL;
}
udev_device = udev_device_new(udev_monitor->udev);
if (udev_device == NULL)
return NULL;
if (memcmp(buf, "libudev", 8) == 0) {
struct udev_monitor_netlink_header *nlh;
/* udev message needs proper version magic */
nlh = (struct udev_monitor_netlink_header *) buf;
if (nlh->magic != htonl(UDEV_MONITOR_MAGIC)) {
udev_err(udev_monitor->udev, "unrecognized message signature (%x != %x)\n",
nlh->magic, htonl(UDEV_MONITOR_MAGIC));
nlh->magic, htonl(UDEV_MONITOR_MAGIC));
udev_device_unref(udev_device);
return NULL;
}
if (nlh->properties_off+32 > (size_t)buflen)
if (nlh->properties_off+32 > (size_t)buflen) {
udev_device_unref(udev_device);
return NULL;
}
bufpos = nlh->properties_off;
/* devices received from udev are always initialized */
udev_device_set_is_initialized(udev_device);
} else {
/* kernel message with header */
bufpos = strlen(buf) + 1;
if ((size_t)bufpos < sizeof("a@/d") || bufpos >= buflen) {
udev_dbg(udev_monitor->udev, "invalid message length\n");
udev_device_unref(udev_device);
return NULL;
}
/* check message header */
if (strstr(buf, "@/") == NULL) {
udev_dbg(udev_monitor->udev, "unrecognized message header\n");
udev_device_unref(udev_device);
return NULL;
}
}
udev_device = udev_device_new(udev_monitor->udev);
if (udev_device == NULL)
return NULL;
udev_device_set_info_loaded(udev_device);
while (bufpos < buflen) {
@@ -664,9 +667,6 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor,
struct udev_list_entry *list_entry;
uint64_t tag_bloom_bits;
if (udev_monitor->snl.nl.nl_family == 0)
return -EINVAL;
blen = udev_device_get_properties_monitor_buf(udev_device, &buf);
if (blen < 32)
return -EINVAL;