ubusd: add missing NULL pointer checks for ACL processing

[project/ubus.git] / ubusd_acl.c

diff --git a/ubusd_acl.c b/ubusd_acl.c
index 9c27750..15a58d8 100644 (file)
--- a/ubusd_acl.c
+++ b/ubusd_acl.c
@@ -101,10 +101,13 @@ ubusd_acl_check(struct ubus_client *cl, const char *obj,
        struct blob_attr *cur;
        int rem;
 
-       if (!cl->gid && !cl->uid)
+       if (!cl->uid)
                return 0;
 
        acl = avl_find_ge_element(&ubusd_acls, obj, acl, avl);
+       if (!acl)
+               return -1;
+
        avl_for_element_to_last(&ubusd_acls, acl, acl, avl) {
                int diff = ubusd_acl_match_path(obj, acl->avl.key, NULL);
 
@@ -415,6 +418,9 @@ ubusd_reply_add(struct ubus_object *obj)
                return;
 
        acl = avl_find_ge_element(&ubusd_acls, obj->path.key, acl, avl);
+       if (!acl)
+               return;
+
        avl_for_element_to_last(&ubusd_acls, acl, acl, avl) {
                void *c;