MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-17 02:59:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

block: integrity: Do not call set_page_dirty_lock()

Browse Source 
commit 39e160505198ff8c158f11bce2ba19809a756e8b upstream.

Placing multiple protection information buffers inside the same page
can lead to oopses because set_page_dirty_lock() can't be called from
interrupt context.

Since a protection information buffer is not backed by a file there is
no point in setting its page dirty, there is nothing to synchronize.
Drop the call to set_page_dirty_lock() and remove the last argument to
bio_integrity_unpin_bvec().

Cc: stable@vger.kernel.org
Fixes: 492c5d4559 ("block: bio-integrity: directly map user buffers")
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Link: https://lore.kernel.org/r/yq1v7r3ev9g.fsf@ca-mkp.ca.oracle.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Martin K. Petersen 2025-04-16 16:04:10 -04:00 committed by Greg Kroah-Hartman
parent db42e6f28b
commit c38a005e6e
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/bio-integrity.c
View File

@ -104,16 +104,12 @@ err:
} }
EXPORT_SYMBOL(bio_integrity_alloc); EXPORT_SYMBOL(bio_integrity_alloc);
static void bio_integrity_unpin_bvec(struct bio_vec *bv, int nr_vecs, static void bio_integrity_unpin_bvec(struct bio_vec *bv, int nr_vecs)
bool dirty)
{ {
int i; int i;
for (i = 0; i < nr_vecs; i++) { for (i = 0; i < nr_vecs; i++)
if (dirty && !PageCompound(bv[i].bv_page))
set_page_dirty_lock(bv[i].bv_page);
unpin_user_page(bv[i].bv_page); unpin_user_page(bv[i].bv_page);
}
} }
static void bio_integrity_uncopy_user(struct bio_integrity_payload *bip) static void bio_integrity_uncopy_user(struct bio_integrity_payload *bip)
@ -129,7 +125,7 @@ static void bio_integrity_uncopy_user(struct bio_integrity_payload *bip)
ret = copy_to_iter(bvec_virt(bounce_bvec), bytes, &orig_iter); ret = copy_to_iter(bvec_virt(bounce_bvec), bytes, &orig_iter);
WARN_ON_ONCE(ret != bytes); WARN_ON_ONCE(ret != bytes);
bio_integrity_unpin_bvec(orig_bvecs, orig_nr_vecs, true); bio_integrity_unpin_bvec(orig_bvecs, orig_nr_vecs);
} }
/** /**
@ -149,8 +145,7 @@ void bio_integrity_unmap_user(struct bio *bio)
return; return;
} }
bio_integrity_unpin_bvec(bip->bip_vec, bip->bip_max_vcnt, bio_integrity_unpin_bvec(bip->bip_vec, bip->bip_max_vcnt);
bio_data_dir(bio) == READ);
} }
/** /**
@ -236,7 +231,7 @@ static int bio_integrity_copy_user(struct bio *bio, struct bio_vec *bvec,
} }
if (write) if (write)
bio_integrity_unpin_bvec(bvec, nr_vecs, false); bio_integrity_unpin_bvec(bvec, nr_vecs);
else else
memcpy(&bip->bip_vec[1], bvec, nr_vecs * sizeof(*bvec)); memcpy(&bip->bip_vec[1], bvec, nr_vecs * sizeof(*bvec));
@ -362,7 +357,7 @@ int bio_integrity_map_user(struct bio *bio, void __user *ubuf, ssize_t bytes,
return 0; return 0;
release_pages: release_pages:
bio_integrity_unpin_bvec(bvec, nr_bvecs, false); bio_integrity_unpin_bvec(bvec, nr_bvecs);
free_bvec: free_bvec:
if (bvec != stack_vec) if (bvec != stack_vec)
kfree(bvec); kfree(bvec);