udevd: fix some memory leaks in error path

Signed-off-by: Yin Kangkai <kangkai.yin@intel.com>

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 6d32e7301702bd19083b6f7db5a665c04c0514e5..4b81a50a8e04a72d7e4be013042a96b7451069b9 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -1761,13 +1761,18 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
 
        /* init token array and string buffer */
        rules->tokens = malloc(PREALLOC_TOKEN * sizeof(struct token));
-       if (rules->tokens == NULL)
+       if (rules->tokens == NULL) {
+               free(rules);
                return NULL;
+       }
        rules->token_max = PREALLOC_TOKEN;
 
        rules->buf = malloc(PREALLOC_STRBUF);
-       if (rules->buf == NULL)
+       if (rules->buf == NULL) {
+               free(rules->tokens);
+               free(rules);
                return NULL;
+       }
        rules->buf_max = PREALLOC_STRBUF;
        /* offset 0 is always '\0' */
        rules->buf[0] = '\0';
@@ -1776,8 +1781,12 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names)
            rules->token_max * sizeof(struct token), rules->token_max, sizeof(struct token), rules->buf_max);
 
        rules->trie_nodes = malloc(PREALLOC_TRIE * sizeof(struct trie_node));
-       if (rules->trie_nodes == NULL)
+       if (rules->trie_nodes == NULL) {
+               free(rules->buf);
+               free(rules->tokens);
+               free(rules);
                return NULL;
+       }
        rules->trie_nodes_max = PREALLOC_TRIE;
        /* offset 0 is the trie root, with an empty string */
        memset(rules->trie_nodes, 0x00, sizeof(struct trie_node));

diff --git a/udev/udevd.c b/udev/udevd.c
index 873634fe4519cf3149201b19727aee22e1b880a1..fbc237143cfa26216963d46c2b12383caaf23f26 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -227,8 +227,10 @@ static void worker_new(struct event *event)
        udev_monitor_enable_receiving(worker_monitor);
 
        worker = calloc(1, sizeof(struct worker));
-       if (worker == NULL)
+       if (worker == NULL) {
+               udev_monitor_unref(worker_monitor);
                return;
+       }
        /* worker + event reference */
        worker->refcount = 2;
        worker->udev = event->udev;