Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1737186

[PATCH] fix unbalanced page refcounting in bio_map_user_iov

Show all headers | View raw

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.

Signed-off-by: Vitaly Mayatskikh <v.mayatskih@gmail.com>

diff --git a/block/bio.c b/block/bio.c
index b38e962fa83e..10cd3b6bed27 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1383,6 +1383,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;
@@ -1397,6 +1398,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;
 		}

-- 
wbr, Vitaly

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] fix unbalanced page refcounting in bio_map_user_iov Vitaly Mayatskikh <v.mayatskih@gmail.com> - 2017-09-22 07:20 +0200
  Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Vitaly Mayatskikh <v.mayatskih@gmail.com> - 2017-09-22 07:30 +0200
  Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Al Viro <viro@ZenIV.linux.org.uk> - 2017-09-23 18:40 +0200
    Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Al Viro <viro@ZenIV.linux.org.uk> - 2017-09-23 19:00 +0200
      Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Al Viro <viro@ZenIV.linux.org.uk> - 2017-09-23 19:20 +0200
        Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Al Viro <viro@ZenIV.linux.org.uk> - 2017-09-23 22:40 +0200
          Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Al Viro <viro@ZenIV.linux.org.uk> - 2017-09-24 16:30 +0200
            Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Al Viro <viro@ZenIV.linux.org.uk> - 2017-09-24 19:20 +0200
            Re: [PATCH] fix unbalanced page refcounting in bio_map_user_iov Vitaly Mayatskikh <v.mayatskih@gmail.com> - 2017-09-25 03:50 +0200

csiph-web