From patchwork Fri Mar 15 06:20:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kangjie Lu X-Patchwork-Id: 10854097 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 D190B1515 for ; Fri, 15 Mar 2019 06:21:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BB13D2A7E7 for ; Fri, 15 Mar 2019 06:21:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AEE332A854; Fri, 15 Mar 2019 06:21:02 +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=ham 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 5672C2A7E7 for ; Fri, 15 Mar 2019 06:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728349AbfCOGU6 (ORCPT ); Fri, 15 Mar 2019 02:20:58 -0400 Received: from mta-p8.oit.umn.edu ([134.84.196.208]:47136 "EHLO mta-p8.oit.umn.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727925AbfCOGU5 (ORCPT ); Fri, 15 Mar 2019 02:20:57 -0400 Received: from localhost (unknown [127.0.0.1]) by mta-p8.oit.umn.edu (Postfix) with ESMTP id 43A4CCBF for ; Fri, 15 Mar 2019 06:20:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at umn.edu Received: from mta-p8.oit.umn.edu ([127.0.0.1]) by localhost (mta-p8.oit.umn.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wui2H7gSgG1W for ; Fri, 15 Mar 2019 01:20:56 -0500 (CDT) Received: from mail-io1-f72.google.com (mail-io1-f72.google.com [209.85.166.72]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mta-p8.oit.umn.edu (Postfix) with ESMTPS id 0EFE4CBA for ; Fri, 15 Mar 2019 01:20:56 -0500 (CDT) Received: by mail-io1-f72.google.com with SMTP id a7so3387105ioq.3 for ; Thu, 14 Mar 2019 23:20:56 -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=Br3/U0mf/R/jQwiIltWwAExumrY4nZjRkWM2M0apZa8=; b=EJvR+z+HXKYN9bnEr7CKAv9UkVhR3jM67CJYW7G/gklZEDYExMUrvVSqw4kxOaOiGb PyvPuMQWbfTsqn9iDAYgckLtuX2Q2lpcsxTsX7gaXd/CvB7N8DGeQIobAhqd5v6NaZ2e FYYQkvkl8/d+U6D+8wySPfKk6No0gH7ThZT+cHy2topxZkKkTwQpliir9kJmfT8IFjhN DoW3+daElxaJtCbGsX3B6k1inJRZ8eTHM/UP9PtG4Lzxsl2TCTxlLh/Se9k/0F24PeLX fzXvMP0rDgADOqt6ynI8zxq9CbS5k/BnpSn0ENTcC7b5mm762lCWe0pkLZmSQ7/0khfj PnAQ== 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=Br3/U0mf/R/jQwiIltWwAExumrY4nZjRkWM2M0apZa8=; b=EoOT/Y3V+RK3Aw4e220WOu970utUQ8Jv9rJoThsYRkdHgIo2jij7cAzM1me7fnMpnG kkF9q0mDHsChYvLMSno2VG3RQ/qwZZFOnpefz5nTsXpRE2UQaCIqgFyJGfxHSbB/vwz+ mbGxx2IAzUONAl2Mist2ZU29czOBYFIaT3rmIJb3Gu6y2/sGD2ReZ+/lBqraV37T7OQA jCBqsdFdoOZvYE133zGxgR1rIFH4HNh5K3TfhNVs5dLokKhRJOyfEW/GiygMVuOd5HnU xXINt6LaGkHMrVflH70sHgpT+gzzK9UL2gvuYjDq8dQxDt/BgnxAvCQnlugOpXKgQklx bCNg== X-Gm-Message-State: APjAAAXFNcZb/79BW45KTjB/t8qLwpDFIfZOZCz5FWN6vECj/O94HPBP Divb9v6OHPzq8U1G3BWYXje9aBulQWvej4VpIvgigzuTLyf2VArMsPonVXtZ2Yh7DOME1DlEeQ5 XMKVmGKVZJLMpEmFKc5Fq0pms79hrTQ== X-Received: by 2002:a02:8a4a:: with SMTP id e10mr1457818jal.120.1552630854722; Thu, 14 Mar 2019 23:20:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqy5AbrXvR3MYaIsOrtbaEE3epm5jjU38uitbYmdpb9Bs0Ds2f/TKZMmNYU1UQbz2VJyPns+Tg== X-Received: by 2002:a02:8a4a:: with SMTP id e10mr1457803jal.120.1552630854477; Thu, 14 Mar 2019 23:20:54 -0700 (PDT) Received: from bee.dtc.umn.edu (cs-bee-u.cs.umn.edu. [128.101.106.63]) by smtp.gmail.com with ESMTPSA id u13sm495570iog.80.2019.03.14.23.20.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Mar 2019 23:20:53 -0700 (PDT) From: Kangjie Lu To: kjlu@umn.edu Cc: pakki001@umn.edu, Andy Gross , David Brown , Srinivas Kandagatla , linux-arm-msm@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: [PATCH] slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register Date: Fri, 15 Mar 2019 01:20:48 -0500 Message-Id: <20190315062048.16642-1-kjlu@umn.edu> X-Mailer: git-send-email 2.17.1 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case platform_device_alloc fails, the fix returns an error code to avoid the NULL pointer dereference. Signed-off-by: Kangjie Lu --- 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 71f094c9ec68..f3585777324c 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1342,6 +1342,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;