FAILED: patch "[PATCH] Fix unsynchronized access to sev members through" failed to apply to 5.4-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 19a23da53932bc8011220bd8c410cb76012de004 Mon Sep 17 00:00:00 2001
From: Peter Gonda <[email protected]>
Date: Wed, 27 Jan 2021 08:15:24 -0800
Subject: [PATCH] Fix unsynchronized access to sev members through
svm_register_enc_region
Grab kvm->lock before pinning memory when registering an encrypted region; sev_pin_memory() relies on kvm->lock being held to ensure correctness when checking and updating the number of pinned pages.
Add a lockdep assertion to help prevent future regressions.
V2
- Fix up patch description
- Correct file paths svm.c -> sev.c
- Add unlock of kvm->lock on sev_pin_memory error
V1
- https://lore.kernel.org/kvm/[email protected]/
Message-Id: <[email protected]>
arch/x86/kvm/svm/sev.c +10 -7
@@ -342,6 +342,8 @@ static struct page **sev_pin_memory(struct kvm *kvm, unsigned long uaddr,unsigned long first, last;int ret; +lockdep_assert_held (&kvm->lock); +if (ulen ==0 || uaddr + ulen < uaddr)return ERR_PTR (-EINVAL );
@@ -1119,12 +1121,20 @@ int svm_register_enc_region(struct kvm *kvm,if (!region)return -ENOMEM ; +mutex_lock (&kvm->lock); region->pages =sev_pin_memory (kvm, range->addr, range->size, ®ion->npages,1 );if (IS_ERR (region->pages)) { ret =PTR_ERR (region->pages); +mutex_unlock (&kvm->lock); goto e_free; } + region->uaddr = range->addr; + region->size = range->size; + +list_add_tail (®ion->list, &sev->regions_list); +mutex_unlock (&kvm->lock); +/* * The guest may change the memory encryption attribute from C=0 -> C=1 * or vice versa for this memory range. Lets make sure caches are
@@ -1133,13 +1143,6 @@ int svm_register_enc_region(struct kvm *kvm,*/ sev_clflush_pages (region->pages, region->npages); - region->uaddr = range->addr; - region->size = range->size; - -mutex_lock (&kvm->lock); -list_add_tail (®ion->list, &sev->regions_list); -mutex_unlock (&kvm->lock); -return ret; e_free: