X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Flib%2Flibudev-monitor.c;h=fc5b176be09f28745472e0c9aa9ffb05be114ce7;hp=bca7ab32b5e520f98bffbeed37d1af888ae7efd1;hb=be7de4097af70515783cd0030f5e7a7a89bbadc8;hpb=9925ab0451b307b5766b12134bdc178e4c89f297

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index bca7ab32b..fc5b176be 100644
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -54,7 +54,7 @@ struct udev_monitor {
  * socket will be used.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev monitor.
+ * release the resources of the udev monitor.
  *
  * Returns: a new udev monitor, or #NULL, in case of an error
  **/
@@ -67,20 +67,19 @@ struct udev_monitor *udev_monitor_new_from_socket(struct udev *udev, const char
 		return NULL;
 	if (socket_path == NULL)
 		return NULL;
-	udev_monitor = malloc(sizeof(struct udev_monitor));
+	udev_monitor = calloc(1, sizeof(struct udev_monitor));
 	if (udev_monitor == NULL)
 		return NULL;
-	memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
 	udev_monitor->refcount = 1;
 	udev_monitor->udev = udev;
 
 	udev_monitor->sun.sun_family = AF_LOCAL;
-	if (udev_monitor->sun.sun_path[0] == '@') {
+	if (socket_path[0] == '@') {
 		/* translate leading '@' to abstract namespace */
 		util_strlcpy(udev_monitor->sun.sun_path, socket_path, sizeof(udev_monitor->sun.sun_path));
 		udev_monitor->sun.sun_path[0] = '\0';
 		udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path);
-	} else if (stat(udev_monitor->sun.sun_path, &statbuf) == 0 && S_ISSOCK(statbuf.st_mode)) {
+	} else if (stat(socket_path, &statbuf) == 0 && S_ISSOCK(statbuf.st_mode)) {
 		/* existing socket file */
 		util_strlcpy(udev_monitor->sun.sun_path, socket_path, sizeof(udev_monitor->sun.sun_path));
 		udev_monitor->addrlen = offsetof(struct sockaddr_un, sun_path) + strlen(socket_path);
@@ -105,10 +104,9 @@ struct udev_monitor *udev_monitor_new_from_netlink(struct udev *udev)
 
 	if (udev == NULL)
 		return NULL;
-	udev_monitor = malloc(sizeof(struct udev_monitor));
+	udev_monitor = calloc(1, sizeof(struct udev_monitor));
 	if (udev_monitor == NULL)
 		return NULL;
-	memset(udev_monitor, 0x00, sizeof(struct udev_monitor));
 	udev_monitor->refcount = 1;
 	udev_monitor->udev = udev;
 
@@ -152,6 +150,13 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
 	return 0;
 }
 
+int udev_monitor_set_receive_buffer_size(struct udev_monitor *udev_monitor, int size)
+{
+	if (udev_monitor == NULL)
+		return -1;
+	return setsockopt(udev_monitor->sock, SOL_SOCKET, SO_RCVBUFFORCE, &size, sizeof(size));
+}
+
 /**
  * udev_monitor_ref:
  * @udev_monitor: udev monitor
@@ -173,7 +178,7 @@ struct udev_monitor *udev_monitor_ref(struct udev_monitor *udev_monitor)
  * @udev_monitor: udev monitor
  *
  * Drop a reference ofa udev monitor. If the refcount reaches zero,
- * the bound socket will be closed, and the ressources of the monitor
+ * the bound socket will be closed, and the resources of the monitor
  * will be released.
  *
  **/
@@ -228,11 +233,11 @@ int udev_monitor_get_fd(struct udev_monitor *udev_monitor)
  * device, fill in the received data, and return the device.
  *
  * Only socket connections with uid=0 are accepted. The caller
- * needs to make sure, that there is data to read from the socket,
- * the call will block until the socket becomes readable.
+ * needs to make sure that there is data to read from the socket.
+ * The call will block until the socket becomes readable.
  *
  * The initial refcount is 1, and needs to be decremented to
- * release the ressources of the udev device.
+ * release the resources of the udev device.
  *
  * Returns: a new udev device, or #NULL, in case of an error
  **/
@@ -244,6 +249,9 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 	char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
 	char buf[4096];
 	size_t bufpos;
+	int devpath_set = 0;
+	int subsystem_set = 0;
+	int action_set = 0;
 	int maj = 0;
 	int min = 0;
 
@@ -313,14 +321,20 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 			util_strlcpy(path, udev_get_sys_path(udev_monitor->udev), sizeof(path));
 			util_strlcat(path, &key[8], sizeof(path));
 			udev_device_set_syspath(udev_device, path);
+			devpath_set = 1;
 		} else if (strncmp(key, "SUBSYSTEM=", 10) == 0) {
 			udev_device_set_subsystem(udev_device, &key[10]);
+			subsystem_set = 1;
 		} else if (strncmp(key, "DEVNAME=", 8) == 0) {
 			udev_device_set_devnode(udev_device, &key[8]);
 		} else if (strncmp(key, "DEVLINKS=", 9) == 0) {
-			char *slink = &key[9];
-			char *next = strchr(slink, ' ');
+			char devlinks[UTIL_PATH_SIZE];
+			char *slink;
+			char *next;
 
+			util_strlcpy(devlinks, &key[9], sizeof(devlinks));
+			slink = devlinks;
+			next = strchr(slink, ' ');
 			while (next != NULL) {
 				next[0] = '\0';
 				udev_device_add_devlink(udev_device, slink);
@@ -333,6 +347,7 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 			udev_device_set_driver(udev_device, &key[7]);
 		} else if (strncmp(key, "ACTION=", 7) == 0) {
 			udev_device_set_action(udev_device, &key[7]);
+			action_set = 1;
 		} else if (strncmp(key, "MAJOR=", 6) == 0) {
 			maj = strtoull(&key[6], NULL, 10);
 		} else if (strncmp(key, "MINOR=", 6) == 0) {
@@ -345,38 +360,35 @@ struct udev_device *udev_monitor_receive_device(struct udev_monitor *udev_monito
 			udev_device_set_seqnum(udev_device, strtoull(&key[7], NULL, 10));
 		} else if (strncmp(key, "TIMEOUT=", 8) == 0) {
 			udev_device_set_timeout(udev_device, strtoull(&key[8], NULL, 10));
-		}
-		if (strncmp(key, "PHYSDEV", 7) == 0)
+		} else if (strncmp(key, "PHYSDEV", 7) == 0) {
+			/* skip deprecated values */
 			continue;
-		udev_device_add_property_from_string(udev_device, key);
+		} else {
+			udev_device_add_property_from_string(udev_device, key);
+		}
 	}
-	udev_device_set_devnum(udev_device, makedev(maj, min));
-
+	if (!devpath_set || !subsystem_set || !action_set) {
+		info(udev_monitor->udev, "missing values, skip\n");
+		udev_device_unref(udev_device);
+		return NULL;
+	}
+	if (maj > 0)
+		udev_device_set_devnum(udev_device, makedev(maj, min));
 	udev_device_set_info_loaded(udev_device);
 	return udev_device;
 }
 
 int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_device *udev_device)
 {
-	const char *action;
-	struct udev_list_entry *list_entry;
-	char buf[4096];
-	size_t bufpos;
+	const char *buf;
+	ssize_t len;
 	ssize_t count;
 
-	action = udev_device_get_action(udev_device);
-	if (action == NULL)
-		return -EINVAL;
-	bufpos = snprintf(buf, sizeof(buf), "%s@%s", action, udev_device_get_devpath(udev_device));
-	bufpos++;
-	udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-		bufpos += util_strlcpy(&buf[bufpos],
-				       udev_list_entry_get_name(list_entry),
-				       sizeof(buf) - bufpos);
-		bufpos++;
-	}
+	len = udev_device_get_properties_monitor_buf(udev_device, &buf);
+	if (len < 32)
+		return -1;
 	count = sendto(udev_monitor->sock,
-		       &buf, bufpos, 0,
+		       buf, len, 0,
 		       (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);
 	info(udev_monitor->udev, "passed %zi bytes to monitor %p, \n", count, udev_monitor);
 	return count;