Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9db18ad authored by Pierre Morel's avatar Pierre Morel Committed by Greg Kroah-Hartman
Browse files

KVM: s390: vsie: fix the length of APCB bitmap 



[ Upstream commit 246be7d2720ea9a795b576067ecc5e5c7a1e7848 ]

bit_and() uses the count of bits as the woking length.
Fix the previous implementation and effectively use
the right bitmap size.

Fixes: 19fd83a6 ("KVM: s390: vsie: allow CRYCB FORMAT-1")
Fixes: 56019f9a ("KVM: s390: vsie: Allow CRYCB FORMAT-2")

Signed-off-by: default avatarPierre Morel <pmorel@linux.ibm.com>
Reviewed-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Link: https://lore.kernel.org/kvm/20230511094719.9691-1-pmorel@linux.ibm.com/


Signed-off-by: default avatarJanosch Frank <frankja@linux.ibm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent baec7967

arch/s390/kvm/vsie.c

+4 −2
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ static int setup_apcb00(struct kvm_vcpu *vcpu, unsigned long *apcb_s, 
			    sizeof(struct kvm_s390_apcb0)))

		return -EFAULT;



	bitmap_and(apcb_s, apcb_s, apcb_h, sizeof(struct kvm_s390_apcb0));

	bitmap_and(apcb_s, apcb_s, apcb_h,

		   BITS_PER_BYTE * sizeof(struct kvm_s390_apcb0));



	return 0;

}
@@ -190,7 +191,8 @@ static int setup_apcb11(struct kvm_vcpu *vcpu, unsigned long *apcb_s, 
			    sizeof(struct kvm_s390_apcb1)))

		return -EFAULT;



	bitmap_and(apcb_s, apcb_s, apcb_h, sizeof(struct kvm_s390_apcb1));

	bitmap_and(apcb_s, apcb_s, apcb_h,

		   BITS_PER_BYTE * sizeof(struct kvm_s390_apcb1));



	return 0;

}