Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e09fc80 authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'stable/for-jens-4.13' of... 

Merge branch 'stable/for-jens-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus

Pull xen block changes from Konrad:

Two fixes, both of them spotted by Amazon:

 1) Fix in Xen-blkfront caused by the re-write in 4.8 time-frame.
 2) Fix in the xen_biovec_phys_mergeable which allowed guest
    requests when using NVMe - to slurp up more data than allowed
    leading to an XSA (which has been made public today).
parents 3280d66a b15bd8cb

drivers/block/xen-blkfront.c

+3 −3
Original line number Diff line number Diff line
@@ -2075,9 +2075,9 @@ static int blkfront_resume(struct xenbus_device *dev) 
			/*

			 * Get the bios in the request so we can re-queue them.

			 */

			if (req_op(shadow[i].request) == REQ_OP_FLUSH ||

			    req_op(shadow[i].request) == REQ_OP_DISCARD ||

			    req_op(shadow[i].request) == REQ_OP_SECURE_ERASE ||

			if (req_op(shadow[j].request) == REQ_OP_FLUSH ||

			    req_op(shadow[j].request) == REQ_OP_DISCARD ||

			    req_op(shadow[j].request) == REQ_OP_SECURE_ERASE ||

			    shadow[j].request->cmd_flags & REQ_FUA) {

				/*

				 * Flush operations don't contain bios, so

drivers/xen/biomerge.c

+1 −2
Original line number Diff line number Diff line
@@ -10,8 +10,7 @@ bool xen_biovec_phys_mergeable(const struct bio_vec *vec1, 
	unsigned long bfn1 = pfn_to_bfn(page_to_pfn(vec1->bv_page));

	unsigned long bfn2 = pfn_to_bfn(page_to_pfn(vec2->bv_page));



	return __BIOVEC_PHYS_MERGEABLE(vec1, vec2) &&

		((bfn1 == bfn2) || ((bfn1+1) == bfn2));

	return bfn1 + PFN_DOWN(vec1->bv_offset + vec1->bv_len) == bfn2;

#else

	/*

	 * XXX: Add support for merging bio_vec when using different page