On 05/09/2011 06:12 PM, Julia Lawall wrote: > I guess there is also a point at which idata has been successfully > allocated but idata->buf has not. > > julia > Yes there is. Thank You for pointing out.
Vladimir Motyka > On Mon, 9 May 2011, Vladimir Motyka wrote: > >> When allocation of idata fails there was a null dereference. >> >> Signed-off-by: Vladimir Motyka <[email protected]> >> --- >> diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c >> index 407836d..a03cdc6 100644 >> --- a/drivers/mmc/card/block.c >> +++ b/drivers/mmc/card/block.c >> @@ -237,7 +237,7 @@ static struct mmc_blk_ioc_data >> *mmc_blk_ioctl_copy_from_user( >> idata = kzalloc(sizeof(*idata), GFP_KERNEL); >> if (!idata) { >> err = -ENOMEM; >> - goto copy_err; >> + goto alloc_err; >> } >> >> if (copy_from_user(&idata->ic, user, sizeof(idata->ic))) { >> @@ -268,8 +268,8 @@ static struct mmc_blk_ioc_data >> *mmc_blk_ioctl_copy_from_user( >> copy_err: >> kfree(idata->buf); >> kfree(idata); >> +alloc_err: >> return ERR_PTR(err); >> - >> } >> >> static int mmc_blk_ioctl_cmd(struct block_device *bdev, >> -- >> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in >> the body of a message to [email protected] >> More majordomo info at http://vger.kernel.org/majordomo-info.html >> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
