[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4DC85081.9090105@gmail.com>
Date: Mon, 09 May 2011 22:37:21 +0200
From: Vladimir Motyka <vladimir.motyka@...il.com>
To: Julia Lawall <julia@...u.dk>
CC: cjb@...top.org, kernel-janitors@...r.kernel.org,
linux-mmc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] drivers/mmc/card/block.c: fix potential null dereference
'idata'
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 <vladimir.motyka@...il.com>
>> ---
>> 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 majordomo@...r.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
>>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists