diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2023-02-15 11:43:43 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-03-22 13:34:05 +0100 |
| commit | 92bbffb33f4462ee39a7a9ef41403082f556d5f2 (patch) | |
| tree | 32cd1ff064d67f3f27c62bfd68cbe9ba007c5e30 | |
| parent | 9579ca57104b055e248d0a00180a0d0889213b71 (diff) | |
| download | linux-stable-92bbffb33f4462ee39a7a9ef41403082f556d5f2.tar.gz linux-stable-92bbffb33f4462ee39a7a9ef41403082f556d5f2.tar.bz2 linux-stable-92bbffb33f4462ee39a7a9ef41403082f556d5f2.zip | |
virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request()
commit c5a338274bdb894f088767bea856be344d0ccaef upstream.
Call the function directly instead.
No functional changes.
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tom Lendacky <thomas.lendacky@amd.com>
Link: https://lore.kernel.org/r/20230307192449.24732-5-bp@alien8.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/virt/coco/sev-guest/sev-guest.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c index 2fac7f712158..fbbc0da15a91 100644 --- a/drivers/virt/coco/sev-guest/sev-guest.c +++ b/drivers/virt/coco/sev-guest/sev-guest.c @@ -407,7 +407,8 @@ retry_request: dev_alert(snp_dev->dev, "Detected error from ASP request. rc: %d, fw_err: %llu\n", rc, *fw_err); - goto disable_vmpck; + snp_disable_vmpck(snp_dev); + return rc; } rc = verify_and_dec_payload(snp_dev, resp_buf, resp_sz); @@ -415,14 +416,11 @@ retry_request: dev_alert(snp_dev->dev, "Detected unexpected decode failure from ASP. rc: %d\n", rc); - goto disable_vmpck; + snp_disable_vmpck(snp_dev); + return rc; } return 0; - -disable_vmpck: - snp_disable_vmpck(snp_dev); - return rc; } static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_ioctl *arg) |