iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: card: fix potential null dereference of 'idata'

Browse Source 
When allocation of idata failed there was a null dereference. Also avoid
calling kfree where it isn't needed.

Signed-off-by: Vladimir Motyka <vladimir.motyka@gmail.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Vladimir Motyka 2011-05-11 00:00:43 -04:00 committed by Chris Ball
parent cf2b5eea1e
commit aea253ecff
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/card/block.c
View File

@ -237,24 +237,24 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
idata = kzalloc(sizeof(*idata), GFP_KERNEL); idata = kzalloc(sizeof(*idata), GFP_KERNEL);
if (!idata) { if (!idata) {
err = -ENOMEM; err = -ENOMEM;
goto copy_err; goto out;
} }
if (copy_from_user(&idata->ic, user, sizeof(idata->ic))) { if (copy_from_user(&idata->ic, user, sizeof(idata->ic))) {
err = -EFAULT; err = -EFAULT;
goto copy_err; goto idata_err;
} }
idata->buf_bytes = (u64) idata->ic.blksz * idata->ic.blocks; idata->buf_bytes = (u64) idata->ic.blksz * idata->ic.blocks;
if (idata->buf_bytes > MMC_IOC_MAX_BYTES) { if (idata->buf_bytes > MMC_IOC_MAX_BYTES) {
err = -EOVERFLOW; err = -EOVERFLOW;
goto copy_err; goto idata_err;
} }
idata->buf = kzalloc(idata->buf_bytes, GFP_KERNEL); idata->buf = kzalloc(idata->buf_bytes, GFP_KERNEL);
if (!idata->buf) { if (!idata->buf) {
err = -ENOMEM; err = -ENOMEM;
goto copy_err; goto idata_err;
} }
if (copy_from_user(idata->buf, (void __user *)(unsigned long) if (copy_from_user(idata->buf, (void __user *)(unsigned long)
@ -267,9 +267,10 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user(
copy_err: copy_err:
kfree(idata->buf); kfree(idata->buf);
idata_err:
kfree(idata); kfree(idata);
out:
return ERR_PTR(err); return ERR_PTR(err);
} }
static int mmc_blk_ioctl_cmd(struct block_device *bdev, static int mmc_blk_ioctl_cmd(struct block_device *bdev,