From patchwork Tue Mar 19 01:45:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aditya Pakki X-Patchwork-Id: 10858687 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 C705517E9 for ; Tue, 19 Mar 2019 01:46:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B154929505 for ; Tue, 19 Mar 2019 01:46:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A566029547; Tue, 19 Mar 2019 01:46: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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable 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 4496B29505 for ; Tue, 19 Mar 2019 01:46:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727330AbfCSBqA (ORCPT ); Mon, 18 Mar 2019 21:46:00 -0400 Received: from mta-p6.oit.umn.edu ([134.84.196.206]:33964 "EHLO mta-p6.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726639AbfCSBqA (ORCPT ); Mon, 18 Mar 2019 21:46:00 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p6.oit.umn.edu (Postfix) with ESMTP id 113BDB51 for ; Tue, 19 Mar 2019 01:45:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p6.oit.umn.edu ([127.0.0.1]) by localhost (mta-p6.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PUyv4hahQl3T for ; Mon, 18 Mar 2019 20:45:58 -0500 (CDT) Received: from mail-io1-f71.google.com (mail-io1-f71.google.com [209.85.166.71]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p6.oit.umn.edu (Postfix) with ESMTPS id CFA2AB40 for ; Mon, 18 Mar 2019 20:45:58 -0500 (CDT) Received: by mail-io1-f71.google.com with SMTP id s184so2634167iod.23 for ; Mon, 18 Mar 2019 18:45:58 -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=7E3cjLWaXlGs4sSzpZNXX9cIzD+McIyyipKe6rnHRvI=; b=M8VCijeSg0vMf7NpLJcbmEJrSm8RpCCZvNvVQpA2hCA0ssclui4i2V2nIazmdNKggL AcuAKD0F945zGx7qAPsYpVJPMFNaQC6YKKeXdA1DeQLLRVZsQkr9KavnvnDcB2AzuPUZ 22Bj1BB7oeMGX9qpAbwmWYXo+wKBx1/HYFQ3XNtovERynRqM+LVjzaFKbMTqVe2QeD3O gVyotVAmZWytr+v9Pps/lnDrUU3/wy776TaY25C3Z7eEZtSBSRYNzVfbfvWgrrfGTW9H jeAPkl5+YPgnJp0wrihF4p7FTjbl4Qa9xRNC0HGzFV+S1GV7jkUig85FAlCdDBgIVg1i W+bg== 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=7E3cjLWaXlGs4sSzpZNXX9cIzD+McIyyipKe6rnHRvI=; b=jlrtAIkj224F2DcIyjeIetXA0Z8OkqMfl0RxLlucSS6qFLCg4vTliWAut1/n0YtQGR k4z6EcEBYpMMuklmiKFcKvAp8SAMT1t+NX93btuwNwWPswB8kA0Yrf/GuaF+cVXjJeM0 MkyF/D8q5F4Pet5xcmJEsvCkX1RAwaln8SeA+dDp4gX2nrutf/ucwpPaIdjzoIY5inRX 6OOsRJgVc7X8QfqJz+1MMgNFOdrt+Vgp63zSx6Vu+9JSUOox3eR5OAzC+fhm5V2v+b39 Jnr0in6DSsPtjZPnjW8VByX0FYulSPYzjaG8ACPKdEgYqdDP4NWrXkMGdrxNtj64bnb4 ZwhA== X-Gm-Message-State: APjAAAU497NzxOz9mZ0TGIgTRRMS1+YUSdkwI5t+w9sd+8KLM0+2ycOn DREx0FotvIjo/RvDuW1+nGbfgmy8L8wO0rkPNt7XE1UVI20UNk1yv0YGKz6G2xm7lvuP8TXEsrX Jr6qeHGa/hql+SPRERJTMqb2P2Wv10JLi364= X-Received: by 2002:a24:618d:: with SMTP id s135mr1312918itc.101.1552959958469; Mon, 18 Mar 2019 18:45:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqz8a/dFwQp6eK9IxpUsyTKK3H+i5ku1YvOyVqLPriSIXwOn6YzosGi/atOapl+kHK3nKwemsg== X-Received: by 2002:a24:618d:: with SMTP id s135mr1312911itc.101.1552959958256; Mon, 18 Mar 2019 18:45:58 -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 f9sm4874883ioo.24.2019.03.18.18.45.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Mar 2019 18:45:57 -0700 (PDT) From: Aditya Pakki To: pakki001@umn.edu Cc: kjlu@umn.edu, Jaehoon Chung , Ulf Hansson , Kukjin Kim , Krzysztof Kozlowski , Heiko Stuebner , Jun Nie , Shawn Guo , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org Subject: [PATCH v2] mmc: dw_mmc: Fix to avoid potential NULL pointer dereference Date: Mon, 18 Mar 2019 20:45:51 -0500 Message-Id: <20190319014551.16559-1-pakki001@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.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. --- V1: Added files dw_mmc-zx.c and dw_mmc-rockchip.c 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 ++ drivers/mmc/host/dw_mmc-rockchip.c | 2 ++ drivers/mmc/host/dw_mmc-zx.c | 2 ++ 5 files changed, 10 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; } diff --git a/drivers/mmc/host/dw_mmc-rockchip.c b/drivers/mmc/host/dw_mmc-rockchip.c index 8c86a800a8fd..20e3471260ea 100644 --- a/drivers/mmc/host/dw_mmc-rockchip.c +++ b/drivers/mmc/host/dw_mmc-rockchip.c @@ -344,6 +344,8 @@ static int dw_mci_rockchip_probe(struct platform_device *pdev) return -ENODEV; match = of_match_node(dw_mci_rockchip_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-zx.c b/drivers/mmc/host/dw_mmc-zx.c index c06b5393312f..abea35431045 100644 --- a/drivers/mmc/host/dw_mmc-zx.c +++ b/drivers/mmc/host/dw_mmc-zx.c @@ -213,6 +213,8 @@ static int dw_mci_zx_probe(struct platform_device *pdev) const struct of_device_id *match; match = of_match_node(dw_mci_zx_match, pdev->dev.of_node); + if (!match) + return -ENXIO; drv_data = match->data; return dw_mci_pltfm_register(pdev, drv_data);