summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2016-10-27 13:22:54 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2016-10-27 13:22:54 +0200
commitb5149a5fd15225c48b45e3f18bb6468fbae9bbd1 (patch)
tree38dc13e36e62faa8aad97c5b2f6c90299301b9de /arch/s390
parentkvm: nVMX: Fix kernel panics induced by illegal INVEPT/INVVPID types (diff)
parentKVM: s390: Fix STHYI buffer alignment for diag224 (diff)
downloadlinux-b5149a5fd15225c48b45e3f18bb6468fbae9bbd1.tar.xz
linux-b5149a5fd15225c48b45e3f18bb6468fbae9bbd1.zip
Merge tag 'kvm-s390-master-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
KVM: s390: Fix wrong memory allocation With commit d86bd1bece6f ("mm/slub: support left redzone") or with slab debugging the allocation of our diag224 buffer is not aligned properly. Let's fix this.
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kvm/sthyi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/sthyi.c b/arch/s390/kvm/sthyi.c
index bd98b7d25200..05c98bb853cf 100644
--- a/arch/s390/kvm/sthyi.c
+++ b/arch/s390/kvm/sthyi.c
@@ -315,7 +315,7 @@ static void fill_diag(struct sthyi_sctns *sctns)
if (r < 0)
goto out;
- diag224_buf = kmalloc(PAGE_SIZE, GFP_KERNEL | GFP_DMA);
+ diag224_buf = (void *)__get_free_page(GFP_KERNEL | GFP_DMA);
if (!diag224_buf || diag224(diag224_buf))
goto out;
@@ -378,7 +378,7 @@ static void fill_diag(struct sthyi_sctns *sctns)
sctns->par.infpval1 |= PAR_WGHT_VLD;
out:
- kfree(diag224_buf);
+ free_page((unsigned long)diag224_buf);
vfree(diag204_buf);
}