Skip to content

Fix null-ptr-deref in bio_integrity_map_user() #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
+17 −0
Open

Fix null-ptr-deref in bio_integrity_map_user() #629

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions block/bio-integrity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,23 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
extraction_flags, &offset);
if (unlikely(ret < 0))
goto free_bvec;
if (unlikely(ret != bytes)) {
/*
* Not all pages could be pinned. This can happen when
* pin_user_pages_fast() returns fewer pages than requested.
* All pages must be pinned to copy user data, so unpin
* whatever we got and fail.
*/
int npinned = DIV_ROUND_UP(offset + ret, PAGE_SIZE);
int i;

for (i = 0; i < npinned; i++)
unpin_user_page(pages[i]);
if (pages != stack_pages)
kvfree(pages);
ret = -EFAULT;
goto free_bvec;
}

nr_bvecs = bvec_from_pages(bvec, pages, nr_vecs, bytes, offset,
&is_p2p);
Expand Down