]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
xen-blkback: fix leak of grant maps on ring setup failure
authorRoger Pau Monné <royger@FreeBSD.org>
Wed, 20 Jan 2021 18:40:51 +0000 (19:40 +0100)
committerMark Johnston <markj@FreeBSD.org>
Wed, 24 Feb 2021 01:42:01 +0000 (20:42 -0500)
commit602f1da04217967e7627be3fe19a56098ad29b6f
tree5d65fea4f512f163e9e3cc3157e1685ba62524cd
parentefc9549ba0c2caffd45e1f7f88fdd75a0225e568
xen-blkback: fix leak of grant maps on ring setup failure

Multi page rings are mapped using a single hypercall that gets passed
an array of grants to map. One of the grants in the array failing to
map would lead to the failure of the whole ring setup operation, but
there was no cleanup of the rest of the grant maps in the array that
could have likely been created as a result of the hypercall.

Add proper cleanup on the failure path during ring setup to unmap any
grants that could have been created.

This is part of XSA-361.

Approved by: so
Security: CVE-2021-26932
Security: FreeBSD-SA-21:06.xen
Security: XSA-361
Sponsored by: Citrix Systems R&D

(cherry picked from commit 808d4aad1022a2a33d222663b0c9badde30b9d45)
(cherry picked from commit dfb372f5d38c302953a6a4e2838179cd0a1a6438)
sys/dev/xen/blkback/blkback.c