From: Mike Snitzer <snitzer@redhat.com>
Date: Thu, 22 Oct 2015 14:56:40 +0000 (-0400)
Subject: dm btree: fix leak of bufio-backed block in btree_split_beneath error path
X-Git-Tag: v4.1.12-92~201^2~81
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1762162aa81af495bdea8f021ca0c8d7c6b791f1;p=users%2Fjedix%2Flinux-maple.git

dm btree: fix leak of bufio-backed block in btree_split_beneath error path

Orabug: 22623817

commit 4dcb8b57df3593dcb20481d9d6cf79d1dc1534be upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

(cherry picked from commit 8104ee7b8f8bcfad0114cdad62dd3b4aea5fcf74)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/md/persistent-data/dm-btree.c b/drivers/md/persistent-data/dm-btree.c
index c7726cebc495..d6e47033b5e0 100644
--- a/drivers/md/persistent-data/dm-btree.c
+++ b/drivers/md/persistent-data/dm-btree.c
@@ -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;
 	}