* [PATCH] block: do not leak memory in bio_copy_user_iov()
@ 2019-04-10 20:27 jglisse
2019-04-10 22:13 ` Chaitanya Kulkarni
2019-04-10 22:14 ` Jens Axboe
0 siblings, 2 replies; 3+ messages in thread
From: jglisse @ 2019-04-10 20:27 UTC (permalink / raw)
To: linux-kernel
Cc: Jérôme Glisse, Jens Axboe, linux-block, Linus Torvalds, stable
From: Jérôme Glisse <jglisse@redhat.com>
When bio_add_pc_page() fails in bio_copy_user_iov() we should free
the page we just allocated otherwise we are leaking it.
Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: stable@vger.kernel.org
---
block/bio.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/block/bio.c b/block/bio.c
index b64cedc7f87c..716510ecd7ff 100644
--- a/block/bio.c
+++ b/block/bio.c
@@ -1298,8 +1298,11 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
}
}
- if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes)
+ if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) {
+ if (!map_data)
+ __free_page(page);
break;
+ }
len -= bytes;
offset = 0;
--
2.20.1
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block: do not leak memory in bio_copy_user_iov()
2019-04-10 20:27 [PATCH] block: do not leak memory in bio_copy_user_iov() jglisse
@ 2019-04-10 22:13 ` Chaitanya Kulkarni
2019-04-10 22:14 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Chaitanya Kulkarni @ 2019-04-10 22:13 UTC (permalink / raw)
To: jglisse, linux-kernel; +Cc: Jens Axboe, linux-block, Linus Torvalds, stable
Looks good.
Reviewed-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
On 04/10/2019 01:28 PM, jglisse@redhat.com wrote:
> From: Jérôme Glisse <jglisse@redhat.com>
>
> When bio_add_pc_page() fails in bio_copy_user_iov() we should free
> the page we just allocated otherwise we are leaking it.
>
> Signed-off-by: Jérôme Glisse <jglisse@redhat.com>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: linux-block@vger.kernel.org
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: stable@vger.kernel.org
> ---
> block/bio.c | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/block/bio.c b/block/bio.c
> index b64cedc7f87c..716510ecd7ff 100644
> --- a/block/bio.c
> +++ b/block/bio.c
> @@ -1298,8 +1298,11 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
> }
> }
>
> - if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes)
> + if (bio_add_pc_page(q, bio, page, bytes, offset) < bytes) {
> + if (!map_data)
> + __free_page(page);
> break;
> + }
>
> len -= bytes;
> offset = 0;
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] block: do not leak memory in bio_copy_user_iov()
2019-04-10 20:27 [PATCH] block: do not leak memory in bio_copy_user_iov() jglisse
2019-04-10 22:13 ` Chaitanya Kulkarni
@ 2019-04-10 22:14 ` Jens Axboe
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2019-04-10 22:14 UTC (permalink / raw)
To: jglisse, linux-kernel; +Cc: linux-block, Linus Torvalds, stable
On 4/10/19 2:27 PM, jglisse@redhat.com wrote:
> From: Jérôme Glisse <jglisse@redhat.com>
>
> When bio_add_pc_page() fails in bio_copy_user_iov() we should free
> the page we just allocated otherwise we are leaking it.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-10 22:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-04-10 20:27 [PATCH] block: do not leak memory in bio_copy_user_iov() jglisse
2019-04-10 22:13 ` Chaitanya Kulkarni
2019-04-10 22:14 ` Jens Axboe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®