Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753407Ab1EIQJ2 (ORCPT ); Mon, 9 May 2011 12:09:28 -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 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= 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: Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1021 Lines: 34 When allocation of idata fails there was a null dereference. Signed-off-by: Vladimir Motyka --- 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 linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/