Commit bfe5b1b1 authored Jul 08, 2016 by Ville Viinikka Committed by Ulf Hansson Jul 18, 2016

mmc: block: fix free of uninitialized 'idata->buf'



Set 'idata->buf' to NULL so that it never gets returned without
initialization. This fixes a bug where mmc_blk_ioctl_cmd() would
free both 'idata' and 'idata->buf' but 'idata->buf' was returned
uninitialized.

Fixes: 1ff8950c ("mmc: block: change to use kmalloc when copy data from userspace")
Signed-off-by: Ville Viinikka <ville@tuxera.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 92d21ac7

drivers/mmc/card/block.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -355,8 +355,10 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
		goto idata_err;
		}

		if (!idata->buf_bytes)
		if (!idata->buf_bytes) {
		idata->buf = NULL;
		return idata;
		}

		idata->buf = kmalloc(idata->buf_bytes, GFP_KERNEL);
		if (!idata->buf) {