lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <20190411210834.4105-14-jglisse@redhat.com> Date: Thu, 11 Apr 2019 17:08:32 -0400 From: jglisse@...hat.com To: linux-kernel@...r.kernel.org Cc: Jérôme Glisse <jglisse@...hat.com>, linux-fsdevel@...r.kernel.org, linux-block@...r.kernel.org, linux-mm@...ck.org, John Hubbard <jhubbard@...dia.com>, Jan Kara <jack@...e.cz>, Dan Williams <dan.j.williams@...el.com>, Alexander Viro <viro@...iv.linux.org.uk>, Johannes Thumshirn <jthumshirn@...e.de>, Christoph Hellwig <hch@....de>, Jens Axboe <axboe@...nel.dk>, Ming Lei <ming.lei@...hat.com>, Dave Chinner <david@...morbit.com>, Jason Gunthorpe <jgg@...pe.ca>, Matthew Wilcox <willy@...radead.org> Subject: [PATCH v1 13/15] fs/splice: use put_user_page() when appropriate From: Jérôme Glisse <jglisse@...hat.com> Use put_user_page() when page reference was taken through GUP. Signed-off-by: Jérôme Glisse <jglisse@...hat.com> Cc: linux-fsdevel@...r.kernel.org Cc: linux-block@...r.kernel.org Cc: linux-mm@...ck.org Cc: John Hubbard <jhubbard@...dia.com> Cc: Jan Kara <jack@...e.cz> Cc: Dan Williams <dan.j.williams@...el.com> Cc: Alexander Viro <viro@...iv.linux.org.uk> Cc: Johannes Thumshirn <jthumshirn@...e.de> Cc: Christoph Hellwig <hch@....de> Cc: Jens Axboe <axboe@...nel.dk> Cc: Ming Lei <ming.lei@...hat.com> Cc: Dave Chinner <david@...morbit.com> Cc: Jason Gunthorpe <jgg@...pe.ca> Cc: Matthew Wilcox <willy@...radead.org> --- fs/splice.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/splice.c b/fs/splice.c index 4a0b522a0cb4..c9c350d37912 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -371,6 +371,7 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, unsigned int nr_pages; size_t offset, base, copied = 0; ssize_t res; + bool gup; int i; if (pipe->nrbufs == pipe->buffers) @@ -383,7 +384,7 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, offset = *ppos & ~PAGE_MASK; iov_iter_pipe(&to, READ, pipe, len + offset); - + gup = iov_iter_get_pages_use_gup(&to); res = iov_iter_get_pages_alloc(&to, &pages, len + offset, &base); if (res <= 0) return -ENOMEM; @@ -419,8 +420,12 @@ static ssize_t default_file_splice_read(struct file *in, loff_t *ppos, if (vec != __vec) kfree(vec); out: - for (i = 0; i < nr_pages; i++) - put_page(pages[i]); + for (i = 0; i < nr_pages; i++) { + if (gup) + put_user_page(pages[i]); + else + put_page(pages[i]); + } kvfree(pages); iov_iter_advance(&to, copied); /* truncates and discards */ return res; -- 2.20.1
Powered by blists - more mailing lists