summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Krowiak <akrowiak@linux.ibm.com>2023-11-09 11:44:20 -0500
committerAlexander Gordeev <agordeev@linux.ibm.com>2023-11-30 16:24:22 +0100
commit7b2d039da622daa9ba259ac6f38701d542b237c3 (patch)
tree469062ef89e50b3dd3125ff083fbc1309abb4d44
parent65f8780e2d70257200547b5a7654974aa7c37ce1 (diff)
downloadlinux-stable-7b2d039da622daa9ba259ac6f38701d542b237c3.tar.gz
linux-stable-7b2d039da622daa9ba259ac6f38701d542b237c3.tar.bz2
linux-stable-7b2d039da622daa9ba259ac6f38701d542b237c3.zip
s390/vfio-ap: unpin pages on gisc registration failure
In the vfio_ap_irq_enable function, after the page containing the notification indicator byte (NIB) is pinned, the function attempts to register the guest ISC. If registration fails, the function sets the status response code and returns without unpinning the page containing the NIB. In order to avoid a memory leak, the NIB should be unpinned before returning from the vfio_ap_irq_enable function. Co-developed-by: Janosch Frank <frankja@linux.ibm.com> Signed-off-by: Janosch Frank <frankja@linux.ibm.com> Signed-off-by: Anthony Krowiak <akrowiak@linux.ibm.com> Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com> Fixes: 783f0a3ccd79 ("s390/vfio-ap: add s390dbf logging to the vfio_ap_irq_enable function") Cc: <stable@vger.kernel.org> Link: https://lore.kernel.org/r/20231109164427.460493-2-akrowiak@linux.ibm.com Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
-rw-r--r--drivers/s390/crypto/vfio_ap_ops.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/s390/crypto/vfio_ap_ops.c b/drivers/s390/crypto/vfio_ap_ops.c
index 4db538a55192..9cb28978c186 100644
--- a/drivers/s390/crypto/vfio_ap_ops.c
+++ b/drivers/s390/crypto/vfio_ap_ops.c
@@ -457,6 +457,7 @@ static struct ap_queue_status vfio_ap_irq_enable(struct vfio_ap_queue *q,
VFIO_AP_DBF_WARN("%s: gisc registration failed: nisc=%d, isc=%d, apqn=%#04x\n",
__func__, nisc, isc, q->apqn);
+ vfio_unpin_pages(&q->matrix_mdev->vdev, nib, 1);
status.response_code = AP_RESPONSE_INVALID_GISA;
return status;
}