From patchwork Mon May 9 14:05:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Motyka X-Patchwork-Id: 769192 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 p49EBI1h003562 for ; Mon, 9 May 2011 14:11:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753782Ab1EIOG7 (ORCPT ); Mon, 9 May 2011 10:06:59 -0400 Received: from mail-bw0-f46.google.com ([209.85.214.46]:42736 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680Ab1EIOG6 (ORCPT ); Mon, 9 May 2011 10:06:58 -0400 Received: by bwz15 with SMTP id 15so3999599bwz.19 for ; Mon, 09 May 2011 07:06:56 -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:content-type:content-transfer-encoding; bh=L4GJ5LxSpBsD9c2MQ8HXrsF6sUdkrn8pE8HjW4iETbA=; b=UoQ0Zec7/UOSH01sOWz71L3X23PrDFzBuqWXfrs1i6AvGiI5ZbUtXDNTflacT5gFvC pRIEtR5wju1i6Ub9tOqUKrNT77NaO+7GD3vO9fJYqluLOH9EwrE1yWghJdeu2wQ+IAwk J+WTMx9RRBR/C4C8H9gvrR+/AcjbTL5Na6ysY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; b=gWZZJpKHn3vem3I/7Wv7Ccicceed5VHK/9Yxjo94GGFfE7e+5UYCOR0n1DUiAAmBv5 v9yHXED7USy45OSq23q9MsM4V/1+mBl0c8+RXOlaIq4f1v7XeAmnwiylkCyuVcSvPOEl yeWbKPQQCFxBStOdJgFgWf7JOU/dVKmCVpnX8= Received: by 10.204.19.18 with SMTP id y18mr3206930bka.179.1304950016311; Mon, 09 May 2011 07:06:56 -0700 (PDT) Received: from [147.32.89.145] (terror.pod.cvut.cz [147.32.89.145]) by mx.google.com with ESMTPS id c11sm3705414bkc.14.2011.05.09.07.06.15 (version=SSLv3 cipher=OTHER); Mon, 09 May 2011 07:06:16 -0700 (PDT) Message-ID: <4DC7F4AB.90607@gmail.com> Date: Mon, 09 May 2011 16:05:31 +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: kernel-janitors@vger.kernel.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] drivers/mmc/card/block.c: fix potential null dereference 'idata' 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 14:11:19 +0000 (UTC) When allocation of idata fails there was a null dereferece. Signed-off-by: Vladimir Motyka --- 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..3dec493 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -266,10 +266,10 @@ static struct mmc_blk_ioc_data *mmc_blk_ioctl_copy_from_user( return idata; copy_err: - kfree(idata->buf); + if(idata) + kfree(idata->buf); kfree(idata); return ERR_PTR(err); - }