From patchwork Mon May 9 16:08:28 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Motyka X-Patchwork-Id: 769662 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p49G9WpH014396 for ; Mon, 9 May 2011 16:09:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753065Ab1EIQJ1 (ORCPT ); Mon, 9 May 2011 12:09:27 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:36362 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827Ab1EIQJQ (ORCPT ); Mon, 9 May 2011 12:09:16 -0400 Received: by bwz15 with SMTP id 15so4101050bwz.19 for ; Mon, 09 May 2011 09:09:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=qL0tRln4bkKdBpjcsElpjWKpywx9Cn7qlFmI5qJSaKI=; b=jqf7HhTopyiYptPVEJxSB2AXAt7B7+nc34KbALHxnhp9obOYDnA+fw2dXSJf05jhHq /y/8XBgxN95Uq8Tle88TBFBiBxbjRNcNjRdnCxIOKm4AB/pvY/2lA5ewY9qZq5yiX78W 1CTgIVTS2U3Re64qDsx6DiPmYZYTT5W06R5kk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=KPFUpL7Y4QRSYRnMUFxCZzfwbsqrZDbnVPLvgnctr7Snc78pv+Q8BOBol80ekUkzk5 6kiNCkP8aGT3pD8SuKN1eN0QDD26+bIbbmGoJ4SkgQSP4KfHQx9HME05m7MNdlGJfil2 wWvFpxkV//7Hgc7VsdD2ThN7I2s++FoxJfjSI= Received: by 10.204.181.7 with SMTP id bw7mr2696169bkb.16.1304957354304; Mon, 09 May 2011 09:09:14 -0700 (PDT) Received: from [147.32.89.145] (terror.pod.cvut.cz [147.32.89.145]) by mx.google.com with ESMTPS id y22sm3767144bku.20.2011.05.09.09.09.12 (version=SSLv3 cipher=OTHER); Mon, 09 May 2011 09:09:13 -0700 (PDT) Message-ID: <4DC8117C.7060200@gmail.com> Date: Mon, 09 May 2011 18:08:28 +0200 From: Vladimir Motyka User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110414 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: cjb@laptop.org CC: Julia Lawall , 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' References: <4DC7F4AB.90607@gmail.com> <4DC802C0.9040302@gmail.com> In-Reply-To: Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 09 May 2011 16:09:32 +0000 (UTC) When allocation of idata fails there was a null dereference. Signed-off-by: Vladimir Motyka --- 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 linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }