From: Vladimir Motyka <vladimir.motyka@gmail.com>
To: Julia Lawall <julia@diku.dk>
Cc: cjb@laptop.org, kernel-janitors@vger.kernel.org,
linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drivers/mmc/card/block.c: fix potential null dereference 'idata'
Date: Mon, 09 May 2011 22:37:40 +0200 [thread overview]
Message-ID: <4DC85094.4050401@gmail.com> (raw)
In-Reply-To: <Pine.LNX.4.64.1105091811320.15483@pc-004.diku.dk>
When allocation of idata failed there was a null dereference. Also avoid
calling kfree where it is needn't.
---
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index 407836d..126c7f4 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -237,24 +237,24 @@ 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 out;
}
if (copy_from_user(&idata->ic, user, sizeof(idata->ic))) {
err = -EFAULT;
- goto copy_err;
+ goto idata_err;
}
idata->buf_bytes = (u64) idata->ic.blksz * idata->ic.blocks;
if (idata->buf_bytes > MMC_IOC_MAX_BYTES) {
err = -EOVERFLOW;
- goto copy_err;
+ goto idata_err;
}
idata->buf = kzalloc(idata->buf_bytes, GFP_KERNEL);
if (!idata->buf) {
err = -ENOMEM;
- goto copy_err;
+ goto idata_err;
}
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:
kfree(idata->buf);
+idata_err:
kfree(idata);
+out:
return ERR_PTR(err);
-
}
static int mmc_blk_ioctl_cmd(struct block_device *bdev,
next prev parent reply other threads:[~2011-05-09 20:38 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-09 14:05 [PATCH] drivers/mmc/card/block.c: fix potential null dereference 'idata' Vladimir Motyka
2011-05-09 14:32 ` Julia Lawall
2011-05-09 15:05 ` Vladimir Motyka
2011-05-09 15:13 ` Andy Shevchenko
2011-05-09 15:14 ` Julia Lawall
2011-05-09 16:08 ` Vladimir Motyka
2011-05-09 16:12 ` Julia Lawall
2011-05-09 20:37 ` Vladimir Motyka
2011-05-09 20:37 ` Vladimir Motyka [this message]
2011-05-11 4:03 ` Chris Ball
2011-05-10 7:47 ` Andy Shevchenko
2011-05-10 7:57 ` Julia Lawall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4DC85094.4050401@gmail.com \
--to=vladimir.motyka@gmail.com \
--cc=cjb@laptop.org \
--cc=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).