aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVille Viinikka <ville@tuxera.com>2016-07-08 11:27:02 -0400
committerUlf Hansson <ulf.hansson@linaro.org>2016-07-18 05:30:54 -0400
commitbfe5b1b1e013f7b1c0fd2ac3b3c8c380114b3fb9 (patch)
tree3b89c9c10ccc1017d9708ede0f4ab7a249946fae
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
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: 1ff8950c0433 ("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>
-rw-r--r--drivers/mmc/card/block.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index e62fde3ac431..c13ba2ab19d6 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -355,8 +355,10 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
355 goto idata_err; 355 goto idata_err;
356 } 356 }
357 357
358 if (!idata->buf_bytes) 358 if (!idata->buf_bytes) {
359 idata->buf = NULL;
359 return idata; 360 return idata;
361 }
360 362
361 idata->buf = kmalloc(idata->buf_bytes, GFP_KERNEL); 363 idata->buf = kmalloc(idata->buf_bytes, GFP_KERNEL);
362 if (!idata->buf) { 364 if (!idata->buf) {