From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 13 Jan 2016 11:28:37 +0000 (+0100)
Subject: ubusd: add missing NULL pointer checks for ACL processing
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1d2b3bbdbefa4901e34506f86f4b4c4412dbb555;p=oweals%2Fubus.git

ubusd: add missing NULL pointer checks for ACL processing

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

diff --git a/ubusd_acl.c b/ubusd_acl.c
index eb5cec5..15a58d8 100644
--- a/ubusd_acl.c
+++ b/ubusd_acl.c
@@ -105,6 +105,9 @@ ubusd_acl_check(struct ubus_client *cl, const char *obj,
 		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;