Skip to content

block: bio-integrity: fix memory leak in bio_integrity_map_user() #826

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: for-next_base
Choose a base branch
from
+6 −15
Open

block: bio-integrity: fix memory leak in bio_integrity_map_user() #826

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
21 changes: 6 additions & 15 deletions block/bio-integrity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
ret = iov_iter_extract_pages(iter, &pages, bytes, nr_vecs,
extraction_flags, &offset);
if (unlikely(ret < 0))
goto free_bvec;
goto out_free;

/*
* Handle partial pinning. This can happen when pin_user_pages_fast()
Expand All @@ -414,16 +414,12 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
for (i = 0; i < npinned; i++)
unpin_user_page(pages[i]);
}
if (pages != stack_pages)
kvfree(pages);
ret = -EFAULT;
goto free_bvec;
goto out_free;
}

nr_bvecs = bvec_from_pages(bvec, pages, nr_vecs, bytes, offset,
&is_p2p);
if (pages != stack_pages)
kvfree(pages);
if (nr_bvecs > queue_max_integrity_segments(q))
copy = true;
if (is_p2p)
Expand All @@ -434,15 +430,10 @@ int bio_integrity_map_user(struct bio *bio, struct iov_iter *iter)
else
ret = bio_integrity_init_user(bio, bvec, nr_bvecs, bytes);
if (ret)
goto release_pages;
if (bvec != stack_vec)
kfree(bvec);

return 0;

release_pages:
bio_integrity_unpin_bvec(bvec, nr_bvecs);
free_bvec:
bio_integrity_unpin_bvec(bvec, nr_bvecs);
out_free:
if (pages != stack_pages)
kvfree(pages);
if (bvec != stack_vec)
kfree(bvec);
return ret;
Expand Down