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.

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);
 }