bloblist: Correct condition in bloblist_addrec()

It is possible to add a blob that ends at the end of the bloblist, but at
present this is not supported. Fix it and add a regression test for this
case.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/common/bloblist.c b/common/bloblist.c
index bb49ecab92ec6cbf2999dd1dc12315fa699de9b7..1290fff850413e603747ac9e84141b014864f28e 100644 (file)
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -118,7 +118,7 @@ static int bloblist_addrec(uint tag, int size, int align,
        /* Calculate the new allocated total */
        new_alloced = data_start + ALIGN(size, align);
 
-       if (new_alloced >= hdr->size) {
+       if (new_alloced > hdr->size) {
                log(LOGC_BLOBLIST, LOGL_ERR,
                    "Failed to allocate %x bytes size=%x, need size=%x\n",
                    size, hdr->size, new_alloced);

diff --git a/test/bloblist.c b/test/bloblist.c
index 345eb181fffc9877ee0a378cc86cb4d3cc3eb097..4104e6a92f6f7ff529be162373701a0198284fa3 100644 (file)
--- a/test/bloblist.c
+++ b/test/bloblist.c
@@ -576,6 +576,29 @@ static int bloblist_test_resize_last(struct unit_test_state *uts)
 }
 BLOBLIST_TEST(bloblist_test_resize_last, 0);
 
+/* Check a completely full bloblist */
+static int bloblist_test_blob_maxsize(struct unit_test_state *uts)
+{
+       void *ptr;
+       int size;
+
+       /* At the start there should be no records */
+       clear_bloblist();
+       ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
+
+       /* Add a blob that takes up all space */
+       size = TEST_BLOBLIST_SIZE - sizeof(struct bloblist_hdr) -
+               sizeof(struct bloblist_rec);
+       ptr = bloblist_add(TEST_TAG, size, 0);
+       ut_assertnonnull(ptr);
+
+       ptr = bloblist_add(TEST_TAG, size + 1, 0);
+       ut_assertnull(ptr);
+
+       return 0;
+}
+BLOBLIST_TEST(bloblist_test_blob_maxsize, 0);
+
 int do_ut_bloblist(struct cmd_tbl *cmdtp, int flag, int argc,
                   char *const argv[])
 {