Merge tag 'kvm-s390-master-4.9-2' of... (b5149a5f) · Commits · 戴 / test

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 ("mm/slub: support left redzone") or with slab debugging the allocation of our diag224 buffer is not aligned properly. Let's fix this.

arch/s390/kvm/sthyi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

Admin message