github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-28 18:21:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This push contains the following changes:

Browse Source 
- Remove duplicate snp_leak_pages call in ccp.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmm06/4ACgkQxycdCkmx
 i6cqQhAAuPBNz7cNVMJwfL+PNv4SQm0vn7j2psPXAS8cTiqi0KA8/O1Z7kqAaEGK
 MW741c+pXBc1OPB/yP8gWQlY8o91S1EnX/ylvBzM+XfWk1XL6IXjOWFD6KMy7T6t
 P/ceoG0WH13h8I0GbGKaNLxuNx3rDneKpc69FrgMKDQ9oDKgP4mLeJFqgmjOncCC
 7oQ9QjR3o4UzBYvkd66R74xW2go1zv8DiZ/NrnX50DQUYtUfc/62mSXVpSZLaqst
 e8WPqU/+Vo+rwb0IVW7A9XAz3l6B9/GY8k2TusREkWkzCs1Tn2qX6Pr7Hi8ss4yh
 bWkZKlb4axBFw3RsA4FT6l6q6czwWPMDKUIfEKhI1aXhBMPFNxbiQrxTJIWNFToI
 /By2uwUxtKDmEJ9/DoH24fQrAMuEUi42CA+EpY0EYC37q2MuNNP4py2hC4en/L4L
 iASC9TAB9igUVxbjQ7w48VZZngKAuviXEakzZ9kVfgDaCvME7wieBQZHCyE7wI7H
 r5bzZvvZLjR+Jw1GHgw75Jrn9jmCE7gnopuzSbA+bS1R3VXLdTo0LXvxV6hdCsYP
 MwnMJMeotjvDTHNX3qKHIOiQlnhk8h7p+pk6K+YtyZjEF05JwSPpuNrEst+NCFPN
 1+klPeEUvY9m7alw5HCtGCTBjciImVhxioE8N9fWOvmrXTVwv5Y=
 =vdZO
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2026-03-18 08:11:46 -07:00
commit c5cb126c48
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/crypto/ccp/sev-dev.c
View File

@ -2408,10 +2408,8 @@ 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)