[GIT PULL 0/1] KVM: s390: Fix for 4.8 (via kvm/master)

[GIT PULL 0/1] KVM: s390: Fix for 4.8 (via kvm/master)

[Cornelia Huck]

Paolo, Radim,

The following changes since commit 20b8f9e2dde171c69da4a79c34fccdc2a8492797:

  Merge tag 'kvm-s390-master-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master (2016-08-30 14:11:33 +0200)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-master-4.8-3

for you to fetch changes up to 4d21cef3ea00ba3ac508eb61fb8db70e3e31df67:

  KVM: s390: vsie: fix riccbd (2016-09-05 13:48:50 +0200)

----------------------------------------------------------------
A bugfix for the vsie code (setting the wrong field).

----------------------------------------------------------------

David Hildenbrand (1):
  KVM: s390: vsie: fix riccbd

 arch/s390/kvm/vsie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.9.3

[GIT PULL 1/1] KVM: s390: vsie: fix riccbd

[Cornelia Huck]

From: David Hildenbrand <dahi@linux.vnet.ibm.com>

We store the address of riccbd at the wrong location, overwriting
gvrd. This means that our nested guest will not be able to use runtime
instrumentation. Also, a memory leak, if our KVM guest actually sets gvrd.

Not noticed until now, as KVM guests never make use of gvrd and runtime
instrumentation wasn't completely tested yet.

Reported-by: Fan Zhang <zhangfan@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---
 arch/s390/kvm/vsie.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
index c106488..d8673e2 100644
--- a/arch/s390/kvm/vsie.c
+++ b/arch/s390/kvm/vsie.c
@@ -584,7 +584,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
 		/* Validity 0x0044 will be checked by SIE */
 		if (rc)
 			goto unpin;
-		scb_s->gvrd = hpa;
+		scb_s->riccbd = hpa;
 	}
 	return 0;
 unpin:
-- 
2.9.3

Re: [GIT PULL 0/1] KVM: s390: Fix for 4.8 (via kvm/master)

[Paolo Bonzini]

On 05/09/2016 14:07, Cornelia Huck wrote:
> Paolo, Radim,
> 
> The following changes since commit 20b8f9e2dde171c69da4a79c34fccdc2a8492797:
> 
>   Merge tag 'kvm-s390-master-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master (2016-08-30 14:11:33 +0200)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git tags/kvm-s390-master-4.8-3
> 
> for you to fetch changes up to 4d21cef3ea00ba3ac508eb61fb8db70e3e31df67:
> 
>   KVM: s390: vsie: fix riccbd (2016-09-05 13:48:50 +0200)
> 
> ----------------------------------------------------------------
> A bugfix for the vsie code (setting the wrong field).
> 
> ----------------------------------------------------------------
> 
> David Hildenbrand (1):
>   KVM: s390: vsie: fix riccbd
> 
>  arch/s390/kvm/vsie.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Pulled, thanks.

Paolo