Commit a080642d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus-5.12b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip 

Pull xen fix from Juergen Gross:
 "One Xen related security fix (XSA-371)"

* tag 'for-linus-5.12b-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen-blkback: don't leak persistent grants from xen_blkbk_map()
parents 1e43c377 a846738f

drivers/block/xen-blkback/blkback.c

+1 −1
Original line number Diff line number Diff line
@@ -891,7 +891,7 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring, 
out:

	for (i = last_map; i < num; i++) {

		/* Don't zap current batch's valid persistent grants. */

		if(i >= last_map + segs_to_map)

		if(i >= map_until)

			pages[i]->persistent_gnt = NULL;

		pages[i]->handle = BLKBACK_INVALID_HANDLE;

	}