Skip to content

Commit c5cb126

Browse files
committed
Merge tag 'v7.0-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu: - Remove duplicate snp_leak_pages call in ccp * tag 'v7.0-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: ccp - Fix leaking the same page twice
2 parents efa0adb + 5c52607 commit c5cb126

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/crypto/ccp/sev-dev.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2408,10 +2408,8 @@ static int sev_ioctl_do_snp_platform_status(struct sev_issue_cmd *argp)
24082408
* in Firmware state on failure. Use snp_reclaim_pages() to
24092409
* transition either case back to Hypervisor-owned state.
24102410
*/
2411-
if (snp_reclaim_pages(__pa(data), 1, true)) {
2412-
snp_leak_pages(__page_to_pfn(status_page), 1);
2411+
if (snp_reclaim_pages(__pa(data), 1, true))
24132412
return -EFAULT;
2414-
}
24152413
}
24162414

24172415
if (ret)

0 commit comments

Comments
 (0)