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: 10858689 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 D0D80922 for ; Tue, 19 Mar 2019 01:46:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE8F4294C0 for ; Tue, 19 Mar 2019 01:46:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A170029534; Tue, 19 Mar 2019 01:46:14 +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=unavailable 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 4015D294C0 for ; Tue, 19 Mar 2019 01:46:14 +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=aZZcWazQlJllpyptnMXrGG29ntlOeHEifuIGiOanqSs=; b=GSD U1LPCHTZv8y1HAlQdQ0nfdJf9iDWyK9xEkA+MBpaR8Bh/ApPzzEO80XxnInkHCAC1X6b0xgAj1oct mKOWKFD4Pl/ujFcogJIlJGOHSm2WBGrT0qhPMuSKMHCSwTpF+6mL/y1tQHwFvvZFn1CIYE0l55N1a Ff5EA89Vk/nSId7IIC3DzvgTrKunQcapKXQJFRTDSSFj+FAotK+RYodNp0wxItPHCCmV1ttAJREMf FIYY407Q+EIzeahaCbMsQukCJwFWOGidZ2lDrUWdzFMxZteEzmaL3iLDgPKWA1RUqYLncAO6gNJon jDAzUX8vfxepylY00FLDYAeMqSWeQqQ==; 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 1h63pS-0000bb-Gi; Tue, 19 Mar 2019 01:46:10 +0000 Received: from mta-p7.oit.umn.edu ([134.84.196.207]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h63pJ-0000Tw-VC for linux-rockchip@lists.infradead.org; Tue, 19 Mar 2019 01:46:03 +0000 Received: from localhost (unknown [127.0.0.1]) by mta-p7.oit.umn.edu (Postfix) with ESMTP id 3A45BB3F for ; Tue, 19 Mar 2019 01:45:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p7.oit.umn.edu ([127.0.0.1]) by localhost (mta-p7.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L6OKGMLndWLE for ; Mon, 18 Mar 2019 20:45:59 -0500 (CDT) Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p7.oit.umn.edu (Postfix) with ESMTPS id 1053EB00 for ; Mon, 18 Mar 2019 20:45:58 -0500 (CDT) Received: by mail-io1-f70.google.com with SMTP id k24so14881412ioa.18 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=GHM/KS/JYAoNJkkp0oCUMWl/NIHfPzYNHUXSowl4mfS3FR3HUp4sarWHyCxCvkhWW7 pCmWuJO6XdR5YZ3XDHl70SS557TG0OMFOQ06JSVNDEHWSHQxVCpqUO09oqI1V1IVRIUx FaSLsuQWvimPy+y+P8fZMh91Wleww5ZPnhoupUGcpjeqR6v70lAm1i74V/+QvOPC50U0 7gv4xZqNtc9cjw7b8Bo6hT50QMbFjZKjhhtGbbDtkBALraaWHNljlzv07V36tuhbBt4q 9Qc7gGfTY94/E8cAb8Wv2DDpaK/BphvjTkcH8v958Ug/1QQaLfzXNpZ46ZuvZ4erNzaB qAEw== X-Gm-Message-State: APjAAAUCQc98M3i89rM1JK3dt2WeFJxSJDPqO/5HWrrJC573ZYLUf3Ew p1GBr5cTZW0KyyBfDHgv60C9fyURT3t9hvnkvqc9HjJFUd4SjNI/0giC0QYjf13+hPs0y1d2Xho XZojR7qJqHOjGCfRnqYJGOTrh6wNCVEZzFnQA X-Received: by 2002:a24:618d:: with SMTP id s135mr1312914itc.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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_184602_086248_6168BD52 X-CRM114-Status: GOOD ( 11.54 ) X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ulf Hansson , linux-samsung-soc@vger.kernel.org, Heiko Stuebner , linux-mmc@vger.kernel.org, kjlu@umn.edu, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Jaehoon Chung , linux-rockchip@lists.infradead.org, Kukjin Kim , Jun Nie , Shawn Guo , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=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. --- 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);