Skip to content

Commit 73f5584

Browse files
swkim101kawasaki
authored andcommitted
block: bio-integrity: Fix null-ptr-deref in bio_integrity_map_user()
pin_user_pages_fast() can partially succeed and return the number of pages that were actually pinned. However, the bio_integrity_map_user() does not handle this partial pinning. This leads to a general protection fault since bvec_from_pages() dereferences an unpinned page address, which is 0. To fix this, add a check to verify that all requested memory is pinned. If partial pinning occurs, unpin the memory and return -EFAULT. Reproducer in blktest: linux-blktests/blktests#244 Kernel Oops: Oops: general protection fault, probably for non-canonical address 0xdffffc0000000001: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 0 UID: 0 PID: 1061 Comm: nvme-passthroug Not tainted 7.0.0-11783-g90957f9314e8-dirty #16 PREEMPT(lazy) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.17.0-0-gb52ca86e094d-prebuilt.qemu.org 04/01/2014 RIP: 0010:bio_integrity_map_user.cold+0x1b0/0x9d6 Fixes: 492c5d4 ("block: bio-integrity: directly map user buffers") Acked-by: Chao Shi <[email protected]> Acked-by: Weidong Zhu <[email protected]> Acked-by: Dave Tian <[email protected]> Signed-off-by: Sungwoo Kim <[email protected]>
1 parent 857ada9 commit 73f5584

1 file changed

Lines changed: 17 additions & 0 deletions

File tree

block/bio-integrity.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,23 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
403403
if (unlikely(ret < 0))
404404
goto free_bvec;
405405

406+
/* Handle partial pinning. This can happen when pin_user_pages_fast()
407+
* returns fewer pages than requested
408+
*/
409+
if (user_backed_iter(iter) && unlikely(ret != bytes)) {
410+
if (0 < ret) {
411+
int npinned = DIV_ROUND_UP(offset + ret, PAGE_SIZE);
412+
int i;
413+
414+
for (i = 0; i < npinned; i++)
415+
unpin_user_page(pages[i]);
416+
}
417+
if (pages != stack_pages)
418+
kvfree(pages);
419+
ret = -EFAULT;
420+
goto free_bvec;
421+
}
422+
406423
nr_bvecs = bvec_from_pages(bvec, pages, nr_vecs, bytes, offset,
407424
&is_p2p);
408425
if (pages != stack_pages)

0 commit comments

Comments
 (0)