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

Commit a3fb577e authored Apr 17, 2014 by Thomas Huth Committed by Christian Borntraeger May 16, 2014

KVM: s390: Improve is_valid_psw()



As a program status word is also invalid (and thus generates an
specification exception) if the instruction address is not even,
we should test this in is_valid_psw(), too. This patch also exports
the function so that it becomes available for other parts of the
S390 KVM code as well.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>

parent 3a801517

arch/s390/kvm/kvm-s390.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -142,6 +142,7 @@ void kvm_s390_reinject_io_int(struct kvm *kvm,
	int kvm_s390_mask_adapter(struct kvm *kvm, unsigned int id, bool masked);		int kvm_s390_mask_adapter(struct kvm *kvm, unsigned int id, bool masked);

	/* implemented in priv.c */		/* implemented in priv.c */
			int is_valid_psw(psw_t *psw);
	int kvm_s390_handle_b2(struct kvm_vcpu *vcpu);		int kvm_s390_handle_b2(struct kvm_vcpu *vcpu);
	int kvm_s390_handle_e5(struct kvm_vcpu *vcpu);		int kvm_s390_handle_e5(struct kvm_vcpu *vcpu);
	int kvm_s390_handle_01(struct kvm_vcpu *vcpu);		int kvm_s390_handle_01(struct kvm_vcpu *vcpu);

arch/s390/kvm/priv.c

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -365,7 +365,8 @@ static void handle_new_psw(struct kvm_vcpu *vcpu)
	#define PSW_ADDR_24 0x0000000000ffffffUL		#define PSW_ADDR_24 0x0000000000ffffffUL
	#define PSW_ADDR_31 0x000000007fffffffUL		#define PSW_ADDR_31 0x000000007fffffffUL

	static int is_valid_psw(psw_t *psw) {		int is_valid_psw(psw_t *psw)
			{
	if (psw->mask & PSW_MASK_UNASSIGNED)		if (psw->mask & PSW_MASK_UNASSIGNED)
	return 0;		return 0;
	if ((psw->mask & PSW_MASK_ADDR_MODE) == PSW_MASK_BA) {		if ((psw->mask & PSW_MASK_ADDR_MODE) == PSW_MASK_BA) {
	@@ -376,6 +377,8 @@ static int is_valid_psw(psw_t *psw) {
	return 0;		return 0;
	if ((psw->mask & PSW_MASK_ADDR_MODE) == PSW_MASK_EA)		if ((psw->mask & PSW_MASK_ADDR_MODE) == PSW_MASK_EA)
	return 0;		return 0;
			if (psw->addr & 1)
			return 0;
	return 1;		return 1;
	}		}