dma: fix error handling on out of memory
PATCH 1/1 dma: fix error handling on out of memory
get_user_pages might return less pages than requested. If this happens for the first iovec in dma_pin_iovec_pages, then nr_iovecs is 0 and so dma_unpin_iovec_pages will not unpin any pages, leaking pinned memory. A similar off by one would trigger for any of the following entries.
Fix by updating nr_iovecs and nr_pages in this case.
---
Error handling in dma_pin_iovec_pages still looks wrong to me. Am I missing something? The following patch against 2.6.36-rc7 was under some very light testing by me.
Thanks,
drivers/dma/iovlock.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
drivers/dma/iovlock.c +7 -1
@@ -107,10 +107,16 @@ struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len) NULL);up_read (¤t->mm->mmap_sem); -if (ret != page_list->nr_pages) +if (unlikely (ret <0 )) goto unpin; local_list->nr_iovecs = i +1 ; + +if (unlikely (ret != page_list->nr_pages)) { + page_list->nr_pages = ret; + goto unpin; + } + }return local_list;
Signature · 1 line
MST
Quoted 5 lines · Michael S. Tsirkin
get_user_pagesmight return less pages than requested. If this happens for the first iovec indma_pin_iovec_pages, thennr_iovecsis 0 and sodma_unpin_iovec_pageswill not unpin any pages, leaking pinned memory. A similar off by one would trigger for any of the following entries.
Quoted 7 lines
Fix by updating
nr_iovecsandnr_pagesin this case.Signed-off-by Michael S. Tsirkin <[email protected]>---
Error handling in
dma_pin_iovec_pagesstill looks wrong to me. Am I missing something?
Still looks wrong it what way? You make sure that nr_iovecs is incremented so that the partial page list is freed, and we only walk the initialized entries in pinned_list.
--
Dan
Quoted 11 lines · Dan Williams
Quoted 10 lines · Michael S. Tsirkin
get_user_pagesmight return less pages than requested. If this happens for the first iovec indma_pin_iovec_pages, thennr_iovecsis 0 and sodma_unpin_iovec_pageswill not unpin any pages, leaking pinned memory. A similar off by one would trigger for any of the following entries.Fix by updating
nr_iovecsandnr_pagesin this case.Signed-off-by Michael S. Tsirkin <[email protected]>---
Quoted 6 lines
Quoted 2 lines
Error handling in
dma_pin_iovec_pagesstill looks wrong to me. Am I missing something?Still looks wrong it what way? You make sure that
nr_iovecsis incremented so that the partial page list is freed, and we only walk the initialized entries inpinned_list.
In that before the patch, if get_user_pages returns less pages than requested, we would leak pinned memory. Right?
Quoted 2 lines
--
Dan