fix more instances of uninitialized padding bytes

diff --git a/blob.c b/blob.c
index e59a6d00ac2e842555ba7004bc53c4ef9e612a61..4817fd4dc218758d7f75d7d0168f67e0978d3943 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -67,6 +67,7 @@ blob_add(struct blob_buf *buf, struct blob_attr *pos, int id, int payload)
        }
 
        blob_init(attr, id, payload + sizeof(struct blob_attr));
+       blob_fill_pad(attr);
        return attr;
 }
 
@@ -91,7 +92,7 @@ blob_buf_free(struct blob_buf *buf)
        buf->buflen = 0;
 }
 
-static void
+void
 blob_fill_pad(struct blob_attr *attr)
 {
        char *buf = (char *) attr;
@@ -109,7 +110,6 @@ blob_set_raw_len(struct blob_attr *attr, unsigned int len)
        len &= BLOB_ATTR_LEN_MASK;
        len |= (id << BLOB_ATTR_ID_SHIFT) & BLOB_ATTR_ID_MASK;
        attr->id_len = cpu_to_be32(len);
-       blob_fill_pad(attr);
 }
 
 struct blob_attr *

diff --git a/blob.h b/blob.h
index 460ea5ed90b5fff07942bf29c19cf964a2d94be1..b21c5bbb93991db1b755a76b636a4a2b796dac50 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -204,6 +204,7 @@ blob_next(const struct blob_attr *attr)
        return (struct blob_attr *) ((char *) attr + blob_pad_len(attr));
 }
 
+extern void blob_fill_pad(struct blob_attr *attr);
 extern void blob_set_raw_len(struct blob_attr *attr, unsigned int len);
 extern bool blob_attr_equal(const struct blob_attr *a1, const struct blob_attr *a2);
 extern int blob_buf_init(struct blob_buf *buf, int id);

diff --git a/blobmsg.c b/blobmsg.c
index 0551b2695cc0f828b11d1019f682b3accc8a5cd6..8a40bf87cc52d1b7f4b0a5961d716b051022f1af 100644 (file)
--- a/blobmsg.c
+++ b/blobmsg.c
@@ -188,6 +188,8 @@ blobmsg_add_string_buffer(struct blob_buf *buf)
 
        attrlen = blob_raw_len(attr) + len;
        blob_set_raw_len(attr, attrlen);
+       blob_fill_pad(attr);
+
        blob_set_raw_len(buf->head, blob_raw_len(buf->head) + blob_pad_len(attr));
 }