Commit 9cf9d28e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
  [S390] KVM: Read buffer overflow
  [S390] kernel: Storing machine flags early in lowcore
parents ff1649ff 53cb780a

arch/s390/kernel/early.c

+3 −0
Original line number Diff line number Diff line
@@ -208,6 +208,9 @@ static noinline __init void detect_machine_type(void) 
		machine_flags |= MACHINE_FLAG_KVM;

	else

		machine_flags |= MACHINE_FLAG_VM;



	/* Store machine flags for setting up lowcore early */

	S390_lowcore.machine_flags = machine_flags;

}



static __init void early_pgm_check_handler(void)

arch/s390/kvm/sigp.c

+4 −3
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address, 
			     unsigned long *reg)

{

	struct kvm_s390_float_interrupt *fi = &vcpu->kvm->arch.float_int;

	struct kvm_s390_local_interrupt *li;

	struct kvm_s390_local_interrupt *li = NULL;

	struct kvm_s390_interrupt_info *inti;

	int rc;

	u8 tmp;
@@ -189,9 +189,10 @@ static int __sigp_set_prefix(struct kvm_vcpu *vcpu, u16 cpu_addr, u32 address, 
		return 2; /* busy */



	spin_lock(&fi->lock);

	if (cpu_addr < KVM_MAX_VCPUS)

		li = fi->local_int[cpu_addr];



	if ((cpu_addr >= KVM_MAX_VCPUS) || (li == NULL)) {

	if (li == NULL) {

		rc = 1; /* incorrect state */

		*reg &= SIGP_STAT_INCORRECT_STATE;

		kfree(inti);