From patchwork Tue Mar 19 00:19:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 10858653 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5DC851709 for ; Tue, 19 Mar 2019 00:19:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D59327F90 for ; Tue, 19 Mar 2019 00:19:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F38428EB3; Tue, 19 Mar 2019 00:19:32 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEFA027F90 for ; Tue, 19 Mar 2019 00:19:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=Hyl2QvWkQsnimlrsZNK/xlGc9HStchEJWZp+k7qJvKs=; b=gW9 FaJoNdoX29uXaGXowR7Ir3AoRhnJ0rDtwnijqpNZ6w25NLy0Iz/OZik545Mlyo6tRLKGB4BUJictx K0V7sVAb3GxUQsbIljcFrMahSc46UwL4mzEoVpenSpfkaEyag7UXxT9Lb4JM7cFsb0J8lcaeLnfk0 hpQAxAwPtf+/fcd4A7o4TchYGiTSJju442Ih4+ruguhKqJGxyWv0hA0KdBg7N4FV0Fr68limlnPVx Nk5R0CTGLatgfz9n11QoQMSCc7TTv2AUv2guMiF59g20/V+e8ubWdQAzcGzc0LwLmVkHGIafJcKD+ 4umfuq2K7aMLwthFrMmrH3wm0+HnerA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h62TZ-0004zk-J5; Tue, 19 Mar 2019 00:19:29 +0000 Received: from mta-p8.oit.umn.edu ([134.84.196.208]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h62TW-0004zM-9f for linux-arm-kernel@lists.infradead.org; Tue, 19 Mar 2019 00:19:28 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 18DF4B1E for ; Tue, 19 Mar 2019 00:19:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qSFk3K5jvg80 for ; Mon, 18 Mar 2019 19:19:23 -0500 (CDT) Received: from mail-it1-f198.google.com (mail-it1-f198.google.com [209.85.166.198]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id E3ABD71A for ; Mon, 18 Mar 2019 19:19:23 -0500 (CDT) Received: by mail-it1-f198.google.com with SMTP id y6so13584556itj.5 for ; Mon, 18 Mar 2019 17:19:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=umn.edu; s=google; h=from:to:cc:subject:date:message-id; bh=IerYCDeB9TUNcf3mJgdeuvGQvGHk5l68wN82k8yc5jI=; b=cypYyimQ4ouOXbcROqDLMSWIw+DyVB6yiq8FVwsCI7Y4K8q6fvYeCWiB9ETJiKCux1 p/gVos3+MH1/3czkj+0qB6Z+n34IZ2JG0IYK2nbMEmWs6yKaGTYjEUWrAv/E7Ghknmha DSjTdyh6FZyqgPHqIb4r8efEJaqXIisPD7BaV/ayV7xVd972rQDalnwuEJoWZ3AwA316 TwjgKIVDtvi+CY9Uc6ESlG2gtPktvNkgWmzjVMRhMuvYaeY1wQrGY+xFa8b486QBAcTn Ys+Wv9SvQfvTv7rUHuOOmOBAZu7knmqi0rHfUG/Cwmk0HSxqsTx7Y54275LDPOdtfuRE LIlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=IerYCDeB9TUNcf3mJgdeuvGQvGHk5l68wN82k8yc5jI=; b=EuIz1B5JEtKm1cYeQHGO/STglANfVyy4mQwX21OZ7zNOlZ2+0sf4pL+nistAIxM/e0 cRg1o8yz/6GCSXkcuF2OnFMpZDD4V7NyQzPL2N04Wdn0y6dXqIjpFfxTWXB/8tpCNW6s 2K+07szf48LkzBM1h2UBG+S04vkk90D8dO+Wnrffgq4HsfV81hCpkkejaIHKSlTaWQFW 3RSt5Y05cNsMtQljP6Cf1YHG5c1DXleaD8wh5oH5nvWqx7rCkqzJObhOe7eFmfiHUXe1 B8eDzeghK/EjWf3Ns/vumMMwpJVzD/CQ+rIpqBj5tGuPb+PvxIg+syD4z4oxFCA1clBo 8oUg== X-Gm-Message-State: APjAAAXaj6yQm5GhfEhQ9D+ZWhe1DaGQHOzY4woDVElgmDxjnCWZHwm4 1O42/fxYPWkwMlKUiFzy9IyGV6GhvEJIh54E2RXpK/JTxMhseEQAVBnP/un4L3kRzWb2H29Uw1A 2MS9DWXEHcROK2J8+2KDm8Nlpg4AkOpkOtdW1pYQ= X-Received: by 2002:a24:2101:: with SMTP id e1mr945166ita.151.1552954763035; Mon, 18 Mar 2019 17:19:23 -0700 (PDT) X-Google-Smtp-Source: APXvYqxBPih/zzyV1BknGrI0f2gjRWlXtsTcThUiwmT8Y8feEyUfod5kz9QYo3B4WzwiXXTPuS8P5A== X-Received: by 2002:a24:2101:: with SMTP id e1mr945163ita.151.1552954762836; Mon, 18 Mar 2019 17:19:22 -0700 (PDT) Received: from lenovo-1.hsd1.mn.comcast.net (c-73-242-25-233.hsd1.mn.comcast.net. [73.242.25.233]) by smtp.googlemail.com with ESMTPSA id u14sm570898itb.3.2019.03.18.17.19.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 17:19:22 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Subject: [PATCH] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference Date: Mon, 18 Mar 2019 19:19:18 -0500 Message-Id: <20190319001918.12042-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_171926_430320_0E215367 X-CRM114-Status: GOOD ( 12.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , linux-samsung-soc@vger.kernel.org, kjlu@umn.edu, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Jaehoon Chung , Kukjin Kim , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP of_match_node can fail and return NULL in case no matching structure. The patches checks for such a scenario and returns -ENXIO. Signed-off-by: Aditya Pakki --- drivers/mmc/host/dw_mmc-exynos.c | 2 ++ drivers/mmc/host/dw_mmc-k3.c | 2 ++ drivers/mmc/host/dw_mmc-pltfm.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/mmc/host/dw_mmc-exynos.c b/drivers/mmc/host/dw_mmc-exynos.c index d46c3439b508..8a75d7314606 100644 --- a/drivers/mmc/host/dw_mmc-exynos.c +++ b/drivers/mmc/host/dw_mmc-exynos.c @@ -554,6 +554,8 @@ static int dw_mci_exynos_probe(struct platform_device *pdev) int ret; match = of_match_node(dw_mci_exynos_match, pdev->dev.of_node); + if (!match) + return -ENXIO; drv_data = match->data; pm_runtime_get_noresume(&pdev->dev); diff --git a/drivers/mmc/host/dw_mmc-k3.c b/drivers/mmc/host/dw_mmc-k3.c index 89cdb3d533bb..cc50b7546a20 100644 --- a/drivers/mmc/host/dw_mmc-k3.c +++ b/drivers/mmc/host/dw_mmc-k3.c @@ -459,6 +459,8 @@ static int dw_mci_k3_probe(struct platform_device *pdev) const struct of_device_id *match; match = of_match_node(dw_mci_k3_match, pdev->dev.of_node); + if (!match) + return -ENXIO; drv_data = match->data; return dw_mci_pltfm_register(pdev, drv_data); diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index 58c13e21bd5a..b1948989f617 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -82,6 +82,8 @@ static int dw_mci_pltfm_probe(struct platform_device *pdev) if (pdev->dev.of_node) { match = of_match_node(dw_mci_pltfm_match, pdev->dev.of_node); + if (!match) + return -ENXIO; drv_data = match->data; }