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

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
parents efa0adb5 5c52607c

drivers/crypto/ccp/sev-dev.c

+1 −3
Original line number Diff line number Diff line
@@ -2408,11 +2408,9 @@ static int sev_ioctl_do_snp_platform_status(struct sev_issue_cmd *argp) 
		 * in Firmware state on failure. Use snp_reclaim_pages() to

		 * transition either case back to Hypervisor-owned state.

		 */

		if (snp_reclaim_pages(__pa(data), 1, true)) {

			snp_leak_pages(__page_to_pfn(status_page), 1);

		if (snp_reclaim_pages(__pa(data), 1, true))

			return -EFAULT;

	}

	}



	if (ret)

		goto cleanup;