From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66F9BC43381 for ; Tue, 19 Mar 2019 00:43:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BE3220989 for ; Tue, 19 Mar 2019 00:43:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727089AbfCSAnS (ORCPT ); Mon, 18 Mar 2019 20:43:18 -0400 Received: from lucky1.263xmail.com ([211.157.147.130]:54200 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726575AbfCSAnS (ORCPT ); Mon, 18 Mar 2019 20:43:18 -0400 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.130]) by lucky1.263xmail.com (Postfix) with ESMTP id 49D0C4FF9E; Tue, 19 Mar 2019 08:43:15 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from [172.16.12.37] (unknown [58.22.7.114]) by smtp.263.net (postfix) whith ESMTP id P11837T140293670135552S1552956193192771_; Tue, 19 Mar 2019 08:43:14 +0800 (CST) X-IP-DOMAINF: 1 X-UNIQUE-TAG: <82fdc2618a9f8efcd820b58b56d8953b> X-RL-SENDER: shawn.lin@rock-chips.com X-SENDER: lintao@rock-chips.com X-LOGIN-NAME: shawn.lin@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Cc: shawn.lin@rock-chips.com, kjlu@umn.edu, Jaehoon Chung , Ulf Hansson , Kukjin Kim , Krzysztof Kozlowski , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: =?UTF-8?Q?Re=3a_=5bPATCH=5d_mmc=3a_dw=5fmmc=3a_Fix_to_avoid_potenti?= =?UTF-8?B?YWwgTlVMTCBwb2ludGVyIGRlcmVmZXJlbmNl44CQ6K+35rOo5oSP77yM6YKu5Lu2?= =?UTF-8?B?55SxbGludXgtbW1jLW93bmVyQHZnZXIua2VybmVsLm9yZ+S7o+WPkeOAkQ==?= To: Aditya Pakki References: <20190319001918.12042-1-pakki001@umn.edu> From: Shawn Lin Message-ID: <74f8916b-72ce-fc8c-a1c2-0f38ea99ab6d@rock-chips.com> Date: Tue, 19 Mar 2019 08:43:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.3 MIME-Version: 1.0 In-Reply-To: <20190319001918.12042-1-pakki001@umn.edu> Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2019/3/19 8:19, Aditya Pakki wrote: > 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(+) > Could you check dw_mmc-zx.c and dw_mmc-rockchip.c as well? > 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; > } > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1DEFC43381 for ; Tue, 19 Mar 2019 00:43:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE80920989 for ; Tue, 19 Mar 2019 00:43:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="FUmd8rQR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE80920989 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=rock-chips.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type: Content-Transfer-Encoding:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=en7yyW4QueRxDIRI0bizHfnegcZl/FC49KPbewRpSZ0=; b=FUmd8rQRn9FUxp8ln+nukiSNs ZFOWrC0ATbgR6iNbO6FZyqyuxy239qgjHXkf7ZFuq7XTGXtE4O5ouHUdP3fBHOzZTlALSAJtN5CMa A/s143k02E7I0CQdAC43BJ4B+8XFY7iUcxmNJXX/80GxZIweA0zWmuTxMrERLSigaW19WsvytGQNv 5l6UWGU+uc35/0Sn5lSECedSpvgft0qObneJpCyzE8tImHST43OUiMgkBdlmSS99SbmgG19/zScbs 3YrYpWoVHItYEs3Jo1VUOG5MqED8fCtyolVeRbAXOCpsD8vzZxUiobj8lx6fl5fTIa9PybXXn4J29 Gt5w332Dw==; 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 1h62qe-0004yn-Ra; Tue, 19 Mar 2019 00:43:20 +0000 Received: from lucky1.263xmail.com ([211.157.147.130]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h62qb-0004yK-RU for linux-arm-kernel@lists.infradead.org; Tue, 19 Mar 2019 00:43:19 +0000 Received: from shawn.lin?rock-chips.com (unknown [192.168.167.130]) by lucky1.263xmail.com (Postfix) with ESMTP id 49D0C4FF9E; Tue, 19 Mar 2019 08:43:15 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from [172.16.12.37] (unknown [58.22.7.114]) by smtp.263.net (postfix) whith ESMTP id P11837T140293670135552S1552956193192771_; Tue, 19 Mar 2019 08:43:14 +0800 (CST) X-IP-DOMAINF: 1 X-UNIQUE-TAG: <82fdc2618a9f8efcd820b58b56d8953b> X-RL-SENDER: shawn.lin@rock-chips.com X-SENDER: lintao@rock-chips.com X-LOGIN-NAME: shawn.lin@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 58.22.7.114 X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: =?UTF-8?Q?Re=3a_=5bPATCH=5d_mmc=3a_dw=5fmmc=3a_Fix_to_avoid_potenti?= =?UTF-8?B?YWwgTlVMTCBwb2ludGVyIGRlcmVmZXJlbmNl44CQ6K+35rOo5oSP77yM6YKu5Lu2?= =?UTF-8?B?55SxbGludXgtbW1jLW93bmVyQHZnZXIua2VybmVsLm9yZ+S7o+WPkeOAkQ==?= To: Aditya Pakki References: <20190319001918.12042-1-pakki001@umn.edu> From: Shawn Lin Message-ID: <74f8916b-72ce-fc8c-a1c2-0f38ea99ab6d@rock-chips.com> Date: Tue, 19 Mar 2019 08:43:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.5.3 MIME-Version: 1.0 In-Reply-To: <20190319001918.12042-1-pakki001@umn.edu> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190318_174318_072928_C4E5F3D1 X-CRM114-Status: GOOD ( 19.94 ) 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, linux-mmc@vger.kernel.org, shawn.lin@rock-chips.com, kjlu@umn.edu, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , Jaehoon Chung , Kukjin Kim , linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2019/3/19 8:19, Aditya Pakki wrote: > 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(+) > Could you check dw_mmc-zx.c and dw_mmc-rockchip.c as well? > 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; > } > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel