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=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT 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 0AB1CC28CC0 for ; Thu, 30 May 2019 03:22:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CE218245EC for ; Thu, 30 May 2019 03:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186550; bh=UqQpgM2LIjyIonQ1lPUloHQJVx5eSfX41d1up0734sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2JmgI4D0ZsnvlTJr0q6q2Zaoj7vlk8+xoDvNT6TaKEz8KI85VGbdbBuKByhQ1CfXF m/RaNMuv4tqiV9TzklkICEGLCLeM0RtqGbVd1jfr58r892l4Hgj90wO//Z0ayaBMBT eSegfhD2fVyN5HjU3t8xaSwQFsQiqXPdAAHgu12k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731859AbfE3DWa (ORCPT ); Wed, 29 May 2019 23:22:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:43928 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730807AbfE3DQr (ORCPT ); Wed, 29 May 2019 23:16:47 -0400 Received: from localhost (ip67-88-213-2.z213-88-67.customer.algx.net [67.88.213.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8CF6D245DE; Thu, 30 May 2019 03:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186206; bh=UqQpgM2LIjyIonQ1lPUloHQJVx5eSfX41d1up0734sQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fnbBuDDAAmqI+jzft4Mf35QENSrLe8J2fQdBufeFUwLkguekYuISlX9lywaUm4a64 WXLkwFDs+oR5vN4aEA34ZdJABO31Trxs0qZRWxNooISQc3OhTvMHTv9h8BY3un+CNN N3KtWdU1KwcDpU+/o2x9iluatUznA9Nyrtg8nDIk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kangjie Lu , Srinivas Kandagatla , Sasha Levin Subject: [PATCH 4.19 094/276] slimbus: fix a potential NULL pointer dereference in of_qcom_slim_ngd_register Date: Wed, 29 May 2019 20:04:12 -0700 Message-Id: <20190530030532.054046669@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190530030523.133519668@linuxfoundation.org> References: <20190530030523.133519668@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit 06d5d6b7f9948a89543e1160ef852d57892c750d ] In case platform_device_alloc fails, the fix returns an error code to avoid the NULL pointer dereference. Signed-off-by: Kangjie Lu Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index 14a9d18306cbf..f63d1b8a09335 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1331,6 +1331,10 @@ static int of_qcom_slim_ngd_register(struct device *parent, return -ENOMEM; ngd->pdev = platform_device_alloc(QCOM_SLIM_NGD_DRV_NAME, id); + if (!ngd->pdev) { + kfree(ngd); + return -ENOMEM; + } ngd->id = id; ngd->pdev->dev.parent = parent; ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME; -- 2.20.1