git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/oss' into for-linus
[pandora-kernel.git]
/
arch
/
s390
/
kvm
/
sigp.c
diff --git
a/arch/s390/kvm/sigp.c
b/arch/s390/kvm/sigp.c
index
3667883
..
0ef81d6
100644
(file)
--- a/
arch/s390/kvm/sigp.c
+++ b/
arch/s390/kvm/sigp.c
@@
-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;
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;
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);
return 2; /* busy */
spin_lock(&fi->lock);
- li = fi->local_int[cpu_addr];
+ 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);
rc = 1; /* incorrect state */
*reg &= SIGP_STAT_INCORRECT_STATE;
kfree(inti);