Skip to content

Commit e3a7792

Browse files
deeglazebonzini
authored andcommitted
kvm: svm: Fix gctx page leak on invalid inputs
Ensure that snp gctx page allocation is adequately deallocated on failure during snp_launch_start. Fixes: 136d8bc ("KVM: SEV: Add KVM_SEV_SNP_LAUNCH_START command") CC: Sean Christopherson <seanjc@google.com> CC: Paolo Bonzini <pbonzini@redhat.com> CC: Thomas Gleixner <tglx@linutronix.de> CC: Ingo Molnar <mingo@redhat.com> CC: Borislav Petkov <bp@alien8.de> CC: Dave Hansen <dave.hansen@linux.intel.com> CC: Ashish Kalra <ashish.kalra@amd.com> CC: Tom Lendacky <thomas.lendacky@amd.com> CC: John Allen <john.allen@amd.com> CC: Herbert Xu <herbert@gondor.apana.org.au> CC: "David S. Miller" <davem@davemloft.net> CC: Michael Roth <michael.roth@amd.com> CC: Luis Chamberlain <mcgrof@kernel.org> CC: Russ Weight <russ.weight@linux.dev> CC: Danilo Krummrich <dakr@redhat.com> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: "Rafael J. Wysocki" <rafael@kernel.org> CC: Tianfei zhang <tianfei.zhang@intel.com> CC: Alexey Kardashevskiy <aik@amd.com> Signed-off-by: Dionna Glaze <dionnaglaze@google.com> Message-ID: <20241105010558.1266699-2-dionnaglaze@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 10299cd commit e3a7792

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/x86/kvm/svm/sev.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2215,10 +2215,6 @@ static int snp_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
22152215
if (sev->snp_context)
22162216
return -EINVAL;
22172217

2218-
sev->snp_context = snp_context_create(kvm, argp);
2219-
if (!sev->snp_context)
2220-
return -ENOTTY;
2221-
22222218
if (params.flags)
22232219
return -EINVAL;
22242220

@@ -2233,6 +2229,10 @@ static int snp_launch_start(struct kvm *kvm, struct kvm_sev_cmd *argp)
22332229
if (params.policy & SNP_POLICY_MASK_SINGLE_SOCKET)
22342230
return -EINVAL;
22352231

2232+
sev->snp_context = snp_context_create(kvm, argp);
2233+
if (!sev->snp_context)
2234+
return -ENOTTY;
2235+
22362236
start.gctx_paddr = __psp_pa(sev->snp_context);
22372237
start.policy = params.policy;
22382238
memcpy(start.gosvw, params.gosvw, sizeof(params.gosvw));

0 commit comments

Comments
 (0)