dm btree: fix leak of bufio-backed block in btree_split_beneath error path
authorMike Snitzer <snitzer@redhat.com>
Thu, 22 Oct 2015 14:56:40 +0000 (10:56 -0400)
committerMike Snitzer <snitzer@redhat.com>
Fri, 23 Oct 2015 18:02:55 +0000 (14:02 -0400)
btree_split_beneath()'s error path had an outstanding FIXME that speaks
directly to the potential for _not_ cleaning up a previously allocated
bufio-backed block.

Fix this by releasing the previously allocated bufio block using
unlock_block().

Reported-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Acked-by: Joe Thornber <thornber@redhat.com>
Cc: stable@vger.kernel.org
drivers/md/persistent-data/dm-btree.c

index b6cec258cc2138497b3c8875fc4defdb7523701f..0e09aef43998ac250cc296122247875eed23ceb2 100644 (file)
@@ -523,7 +523,7 @@ static int btree_split_beneath(struct shadow_spine *s, uint64_t key)
 
        r = new_block(s->info, &right);
        if (r < 0) {
-               /* FIXME: put left */
+               unlock_block(s->info, left);
                return r;
        }