Skip to content

Commit dc90171

Browse files
swkim101kawasaki
authored andcommitted
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. 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 6a0b974 commit dc90171

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

block/bio-integrity.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,20 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
402402
extraction_flags, &offset);
403403
if (unlikely(ret < 0))
404404
goto free_bvec;
405+
/* Handle partial pinning. This can happen when pin_user_pages_fast()
406+
* returns fewer pages than requested
407+
*/
408+
if (unlikely(ret != bytes)) {
409+
int npinned = DIV_ROUND_UP(offset + ret, PAGE_SIZE);
410+
int i;
411+
412+
for (i = 0; i < npinned; i++)
413+
unpin_user_page(pages[i]);
414+
if (pages != stack_pages)
415+
kvfree(pages);
416+
ret = -EFAULT;
417+
goto free_bvec;
418+
}
405419

406420
nr_bvecs = bvec_from_pages(bvec, pages, nr_vecs, bytes, offset,
407421
&is_p2p);

0 commit comments

Comments
 (0)