libudev: monitor - replace far too expensive snprintf() with strlcpy()

[elogind.git] / udev / lib / libudev-monitor.c

diff --git a/udev/lib/libudev-monitor.c b/udev/lib/libudev-monitor.c
index d0f28849aa11bf126b1600e1e0744b06a893d66e..9f139170421bc21f75956a40e62bd92cd32f3c16 100644 (file)
--- a/udev/lib/libudev-monitor.c
+++ b/udev/lib/libudev-monitor.c
@@ -67,10 +67,9 @@ 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;
 
@@ -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
@@ -379,19 +384,37 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor, struct udev_devi
        struct udev_list_entry *list_entry;
        char buf[4096];
        size_t bufpos;
+       size_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++;
+
+       bufpos = util_strlcpy(buf, action, sizeof(buf));
+       len = util_strlcpy(&buf[bufpos], "@", sizeof(buf)-bufpos);
+       if (len >= sizeof(buf)-bufpos)
+               return -1;
+       bufpos += len;
+       len = util_strlcpy(&buf[bufpos], udev_device_get_devpath(udev_device), sizeof(buf)-bufpos);
+       if (len+1 >= sizeof(buf)-bufpos)
+               return -1;
+       bufpos += len+1;
        udev_list_entry_foreach(list_entry, udev_device_get_properties_list_entry(udev_device)) {
-               bufpos += snprintf(&buf[bufpos], sizeof(buf) - bufpos, "%s=%s",
-                                  udev_list_entry_get_name(list_entry),
-                                  udev_list_entry_get_value(list_entry));
-               bufpos++;
+               len = util_strlcpy(&buf[bufpos], udev_list_entry_get_name(list_entry), sizeof(buf)-bufpos);
+               if (len >= sizeof(buf)-bufpos)
+                       return -1;
+               bufpos += len;
+               len = util_strlcpy(&buf[bufpos], "=", sizeof(buf)-bufpos);
+               if (len >= sizeof(buf)-bufpos)
+                       return -1;
+               bufpos += len;
+               len = util_strlcpy(&buf[bufpos], udev_list_entry_get_value(list_entry), sizeof(buf)-bufpos);
+               if (len+1 >= sizeof(buf)-bufpos)
+                       return -1;
+               bufpos += len+1;
        }
+
        count = sendto(udev_monitor->sock,
                       &buf, bufpos, 0,
                       (struct sockaddr *)&udev_monitor->sun, udev_monitor->addrlen);