Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753723AbbKLHp2 (ORCPT ); Thu, 12 Nov 2015 02:45:28 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:33463 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753607AbbKLHp2 (ORCPT ); Thu, 12 Nov 2015 02:45:28 -0500 From: LABBE Corentin To: balbi@ti.com, gregkh@linuxfoundation.org Cc: LABBE Corentin , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH] usb: phy: msm: fix a possible NULL dereference Date: Thu, 12 Nov 2015 08:45:23 +0100 Message-Id: <1447314323-30959-1-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1614 Lines: 49 of_match_device could return NULL, and so cause a NULL pointer dereference later. Renaming id to of_id (like all others do) in the process. Reported-by: coverity (CID 1324133) Signed-off-by: LABBE Corentin --- drivers/usb/phy/phy-msm-usb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index 80eb991..c4a66cf 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c @@ -1506,20 +1506,23 @@ static int msm_otg_read_dt(struct platform_device *pdev, struct msm_otg *motg) { struct msm_otg_platform_data *pdata; struct extcon_dev *ext_id, *ext_vbus; - const struct of_device_id *id; + const struct of_device_id *of_id; struct device_node *node = pdev->dev.of_node; struct property *prop; int len, ret, words; u32 val, tmp[3]; + of_id = of_match_device(msm_otg_dt_match, &pdev->dev); + if (!of_id) + return -ENODEV; + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return -ENOMEM; motg->pdata = pdata; - id = of_match_device(msm_otg_dt_match, &pdev->dev); - pdata->phy_type = (enum msm_usb_phy_type) id->data; + pdata->phy_type = (enum msm_usb_phy_type)of_id->data; motg->link_rst = devm_reset_control_get(&pdev->dev, "link"); if (IS_ERR(motg->link_rst)) -- 2.4.10 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/