tests: blobmsg/json: add more test cases

[project/libubox.git] / blobmsg.c

diff --git a/blobmsg.c b/blobmsg.c
index 8019c45b83edff22263cd550497f67d4c0bc49ed..1dd57e156122ec06d1797f9a17fb10938c2fc356 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -25,51 +25,91 @@ static const int blob_type[__BLOBMSG_TYPE_LAST] = {
        [BLOBMSG_TYPE_UNSPEC] = BLOB_ATTR_BINARY,
 };
 
-static uint16_t
-blobmsg_namelen(const struct blobmsg_hdr *hdr)
+bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
 {
-       return be16_to_cpu(hdr->namelen);
+       return blobmsg_check_attr_len(attr, name, blob_raw_len(attr));
 }
 
-bool blobmsg_check_attr(const struct blob_attr *attr, bool name)
+static bool blobmsg_check_name(const struct blob_attr *attr, size_t len, bool name)
 {
+       char *limit = (char *) attr + len;
        const struct blobmsg_hdr *hdr;
-       const char *data;
-       int id, len;
 
-       if (blob_len(attr) < sizeof(struct blobmsg_hdr))
+       hdr = blob_data(attr);
+       if (name && !hdr->namelen)
                return false;
 
-       hdr = (void *) attr->data;
-       if (!hdr->namelen && name)
+       if ((char *) hdr->name + blobmsg_namelen(hdr) > limit)
                return false;
 
-       if (blobmsg_namelen(hdr) > blob_len(attr) - sizeof(struct blobmsg_hdr))
+       if (blobmsg_namelen(hdr) > (blob_len(attr) - sizeof(struct blobmsg_hdr)))
                return false;
 
        if (hdr->name[blobmsg_namelen(hdr)] != 0)
                return false;
 
-       id = blob_id(attr);
-       len = blobmsg_data_len(attr);
+       return true;
+}
+
+static const char* blobmsg_check_data(const struct blob_attr *attr, size_t len, size_t *data_len)
+{
+       char *limit = (char *) attr + len;
+       const char *data;
+
+       *data_len = blobmsg_data_len(attr);
+       if (*data_len > blob_raw_len(attr))
+               return NULL;
+
        data = blobmsg_data(attr);
+       if (data + *data_len > limit)
+               return NULL;
+
+       return data;
+}
+
+bool blobmsg_check_attr_len(const struct blob_attr *attr, bool name, size_t len)
+{
+       const char *data;
+       size_t data_len;
+       int id;
+
+       if (len < sizeof(struct blob_attr))
+               return false;
 
+       if (!blobmsg_check_name(attr, len, name))
+               return false;
+
+       id = blob_id(attr);
        if (id > BLOBMSG_TYPE_LAST)
                return false;
 
        if (!blob_type[id])
                return true;
 
-       return blob_check_type(data, len, blob_type[id]);
+       data = blobmsg_check_data(attr, len, &data_len);
+       if (!data)
+               return false;
+
+       return blob_check_type(data, data_len, blob_type[id]);
 }
 
 int blobmsg_check_array(const struct blob_attr *attr, int type)
+{
+       return blobmsg_check_array_len(attr, type, blobmsg_len(attr));
+}
+
+int blobmsg_check_array_len(const struct blob_attr *attr, int type, size_t len)
 {
        struct blob_attr *cur;
        bool name;
-       int rem;
        int size = 0;
 
+       if (type > BLOBMSG_TYPE_LAST)
+               return -1;
+
+       if (!blobmsg_check_attr_len(attr, false, len))
+               return -1;
+
        switch (blobmsg_type(attr)) {
        case BLOBMSG_TYPE_TABLE:
                name = true;
@@ -81,11 +121,11 @@ int blobmsg_check_array(const struct blob_attr *attr, int type)
                return -1;
        }
 
-       blobmsg_for_each_attr(cur, attr, rem) {
+       __blobmsg_for_each_attr(cur, attr, len) {
                if (type != BLOBMSG_TYPE_UNSPEC && blobmsg_type(cur) != type)
                        return -1;
 
-               if (!blobmsg_check_attr(cur, name))
+               if (!blobmsg_check_attr_len(cur, name, len))
                        return -1;
 
                size++;
@@ -99,6 +139,11 @@ bool blobmsg_check_attr_list(const struct blob_attr *attr, int type)
        return blobmsg_check_array(attr, type) >= 0;
 }
 
+bool blobmsg_check_attr_list_len(const struct blob_attr *attr, int type, size_t len)
+{
+       return blobmsg_check_array_len(attr, type, len) >= 0;
+}
+
 int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
                        struct blob_attr **tb, void *data, unsigned int len)
 {
@@ -111,7 +156,7 @@ int blobmsg_parse_array(const struct blobmsg_policy *policy, int policy_len,
                    blob_id(attr) != policy[i].type)
                        continue;
 
-               if (!blobmsg_check_attr(attr, false))
+               if (!blobmsg_check_attr_len(attr, false, len))
                        return -1;
 
                if (tb[i])
@@ -158,7 +203,7 @@ int blobmsg_parse(const struct blobmsg_policy *policy, int policy_len,
                        if (blobmsg_namelen(hdr) != pslen[i])
                                continue;
 
-                       if (!blobmsg_check_attr(attr, true))
+                       if (!blobmsg_check_attr_len(attr, true, len))
                                return -1;
 
                        if (tb[i])
@@ -195,7 +240,10 @@ blobmsg_new(struct blob_buf *buf, int type, const char *name, int payload_len, v
        attr->id_len |= be32_to_cpu(BLOB_ATTR_EXTENDED);
        hdr = blob_data(attr);
        hdr->namelen = cpu_to_be16(namelen);
-       strcpy((char *) hdr->name, (const char *)name);
+
+       memcpy(hdr->name, name, namelen);
+       hdr->name[namelen] = '\0';
+
        pad_end = *data = blobmsg_data(attr);
        pad_start = (char *) &hdr->name[namelen];
        if (pad_start < pad_end)
@@ -230,8 +278,8 @@ blobmsg_open_nested(struct blob_buf *buf, const char *name, bool array)
        return (void *)offset;
 }
 
-int
-blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
+__attribute__((format(printf, 3, 0)))
+int blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_list arg)
 {
        va_list arg2;
        char cbuf;
@@ -251,8 +299,8 @@ blobmsg_vprintf(struct blob_buf *buf, const char *name, const char *format, va_l
        return ret;
 }
 
-int
-blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
+__attribute__((format(printf, 3, 4)))
+int blobmsg_printf(struct blob_buf *buf, const char *name, const char *format, ...)
 {
        va_list ap;
        int ret;