diff mbox series

[SRU,Zesty,1/2] fix unbalanced page refcounting in bio_map_user_iov

Message ID 20171208133848.18906-2-kleber.souza@canonical.com
State New
Headers show
Series Fix for CVE-2017-12190 | expand

Commit Message

Kleber Sacilotto de Souza Dec. 8, 2017, 1:38 p.m. UTC 
From: Vitaly Mayatskikh <v.mayatskih@gmail.com>

bio_map_user_iov and bio_unmap_user do unbalanced pages refcounting if
IO vector has small consecutive buffers belonging to the same page.
bio_add_pc_page merges them into one, but the page reference is never
dropped.

Cc: stable@vger.kernel.org
Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

CVE-2017-12190
(cherry picked from commit 95d78c28b5a85bacbc29b8dba7c04babb9b0d467)
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
---
 block/bio.c | 8 ++++++++
 1 file changed, 8 insertions(+)

Comments

Thadeu Lima de Souza Cascardo Dec. 13, 2017, 8:44 a.m. UTC | #1 
Applied to zesty master-next branch.

Thanks.
Cascardo.

Applied-to: zesty/master-next
diff mbox series

Patch

diff --git a/block/bio.c b/block/bio.c
index 17ece5b40a2f..13185834b253 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1372,6 +1372,7 @@  struct bio *bio_map_user_iov(struct request_queue *q,
 		offset = offset_in_page(uaddr);
 		for (j = cur_page; j < page_limit; j++) {
 			unsigned int bytes = PAGE_SIZE - offset;
+			unsigned short prev_bi_vcnt = bio->bi_vcnt;
 
 			if (len <= 0)
 				break;
@@ -1386,6 +1387,13 @@  struct bio *bio_map_user_iov(struct request_queue *q,
 					    bytes)
 				break;
 
+			/*
+			 * check if vector was merged with previous
+			 * drop page reference if needed
+			 */
+			if (bio->bi_vcnt == prev_bi_vcnt)
+				put_page(pages[j]);
+
 			len -= bytes;
 			offset = 0;
 		}