From patchwork Sun Aug 21 03:34:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Lin X-Patchwork-Id: 9291977 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EBD3B608A7 for ; Sun, 21 Aug 2016 03:39:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D3C2428AEC for ; Sun, 21 Aug 2016 03:39:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C85E928BF9; Sun, 21 Aug 2016 03:39:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5D78A28AEC for ; Sun, 21 Aug 2016 03:39:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752154AbcHUDi5 (ORCPT ); Sat, 20 Aug 2016 23:38:57 -0400 Received: from lucky1.263xmail.com ([211.157.147.131]:39929 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751936AbcHUDi5 (ORCPT ); Sat, 20 Aug 2016 23:38:57 -0400 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.234]) by lucky1.263xmail.com (Postfix) with ESMTP id 7A7C68E7E8; Sun, 21 Aug 2016 11:38:50 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 X-ADDR-CHECKED: 0 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.263.net (Postfix) with ESMTP id 745FD335D; Sun, 21 Aug 2016 11:38:50 +0800 (CST) X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: ulf.hansson@linaro.org X-SENDER-IP: 58.22.7.114 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: <2d16ab88060380409ce5a66f858dc5a8> X-ATTACHMENT-NUM: 0 X-SENDER: lintao@rock-chips.com X-DNS-TYPE: 0 Received: from localhost.localdomain (unknown [58.22.7.114]) by smtp.263.net (Postfix) whith ESMTP id 16188YCEJC6; Sun, 21 Aug 2016 11:38:50 +0800 (CST) From: Shawn Lin To: =Ulf Hansson Cc: linux-mmc@vger.kernel.org, linux-rockchip@lists.infradead.org, Shawn Lin Subject: [PATCH] mmc: android-goldfish: fix potential panic due to null pointer Date: Sun, 21 Aug 2016 11:34:36 +0800 Message-Id: <1471750476-335-1-git-send-email-shawn.lin@rock-chips.com> X-Mailer: git-send-email 1.8.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP We should never compare virt_base with zero to indicate whether we get the right buffer or not from dma_alloc_coherent. It's quite architecture related. If failing to get the address from CMA or swoitlb cases, the sub architecture code should decide the return value for it. So we should never presume that zero always means the failure. Signed-off-by: Shawn Lin --- drivers/mmc/host/android-goldfish.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/android-goldfish.c b/drivers/mmc/host/android-goldfish.c index dca5518..6d8bd03 100644 --- a/drivers/mmc/host/android-goldfish.c +++ b/drivers/mmc/host/android-goldfish.c @@ -484,7 +484,7 @@ static int goldfish_mmc_probe(struct platform_device *pdev) host->virt_base = dma_alloc_coherent(&pdev->dev, BUFFER_SIZE, &buf_addr, GFP_KERNEL); - if (host->virt_base == 0) { + if (!host->virt_base) { ret = -ENOMEM; goto dma_alloc_failed; }