From patchwork Sat Apr 13 10:34:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 162173 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp638616jan; Sat, 13 Apr 2019 03:34:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGa+YN/bAfdxiS6tTVdC7Nr4pTE+grlvErEbutXm3EcXy7TEtK++Yq/6xpSWeSsE4yl5Ha X-Received: by 2002:a17:902:8d89:: with SMTP id v9mr62886455plo.230.1555151693997; Sat, 13 Apr 2019 03:34:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555151693; cv=none; d=google.com; s=arc-20160816; b=gyRgSI6DJkOT7SBwCOGeM+sLVsesM1I7d6dQ1t+kwrX5frrqiP7lJkVlLbTDV0umcp UROCqRW2aGzOsP02kmtCBNyaKfeTOtLp8ZpIdFUBhkEoXh8+qryW1CXBSbH9Wl/KExAx 2tNmxu04E7PCkz+4CFFoU+BDKBhzUfbxBiSnfA9QWREN0mg6KLlV6JYUn9QK5JgG0Ls0 t4hLofg546qNx8hFG5zCa8cISwSMYz/r1oIwfUpJihoY2Gng4VwHLDvOeobWMgSEHZkS n+kdG3ptMLSOSN2k2I8ntEM6ChIgCO1uFkk359ZnQUskzi8W3Pi6TCw3P5iNC8+HCMSq hFuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xB7d15HDtlm2Iw4UdBy0TeItX/FDCpsJFoIKT0Z/+rI=; b=amrbICPqUoSMl62gD5xBFrYfVU9XSzNfC11+HAdst5XFCv+WLCFs8JlGGZZwruIdzb 4XmpXB4PDTTZvQ26ah4J8mV4g5fW4Ew4QwjJfwyLoA/N999B7Hp/PRbwnePPMICd8fv1 HUkKp3DMJOLaGNdwYlMmSpubG/B6SfgchQb6Cna/A0+yfb6i58RGFEvQzTAjZ6C1Lfe6 NvNl37NlOoEYD8XsDhaR8HqABtci6uhTl7Cdp2Zh9z9F6U0sohLmjlISCRAL8hamYjzk iVKunxWCSBT9en09yAWLXh+Q61AKe0FTadvuH2T7La0ndmQdi2OZY1W0AG7EhyUdMpQP b8Bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=raLvbQlr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f16si34711024pgh.309.2019.04.13.03.34.53; Sat, 13 Apr 2019 03:34:53 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=raLvbQlr; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727853AbfDMKew (ORCPT + 30 others); Sat, 13 Apr 2019 06:34:52 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50581 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725776AbfDMKev (ORCPT ); Sat, 13 Apr 2019 06:34:51 -0400 Received: by mail-wm1-f67.google.com with SMTP id z11so14282702wmi.0 for ; Sat, 13 Apr 2019 03:34:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=xB7d15HDtlm2Iw4UdBy0TeItX/FDCpsJFoIKT0Z/+rI=; b=raLvbQlre//k5BpAeG2FSg2rNSOHqQIZ80YqB7jMNk05CChZyCivxmIOXam/LY+6jj aG6co5E3ZM0rEMHUTEa9b20NyYDMJlZ4ZxzGidDEvIqffHN0v/dGBFt/FHV/cNKyKUw1 NckxSLiyOy8GDb8CTYDb0XiAVImRI/NVT72Qj9veagTOnpbIAjAjl0avmojIAY5rRkB1 Vo/mjQToRKHsB+9oo2LgB0WwEbH7qHA+Y/ZOqn2+Vi+PiVMdMgGiAWL/c5YF+j4YKK+a b9NeVd3hVW+QYGOdO2Fg0mQOd30y39p0hvXW1bIhuKsS9BdK/zzF3SwPAiLWKOdJIQmw rXGw== 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:mime-version :content-transfer-encoding; bh=xB7d15HDtlm2Iw4UdBy0TeItX/FDCpsJFoIKT0Z/+rI=; b=oZK4aPxGIpvdVKQ4NkhLNT/515k1bWItx8mLDZSGZA7mo/RNeCPlYHZH2BRCJlL6OR IUcxdj0hUdInHvUfgBw2bLeVUhXN+jSmkp0ji2kvQbW//uNfIO0YY1xvzdqZ50g0XLW6 0UqEX8Om8wMSWUkVPx7Aa90tSY1O39P2PM4if1tVDkRoXKgm9RDyMJtiwk3m+fgWNvNc n/waB4mT+MnUE6y8zFidD6D3SQfbQBplfwFjmEaFPHasiMOkcuBBLramH0z0qbfxitnI 0iYFeLhN5F92orImzRj0xKs+39do0fvWwMlxaX112Nk/KugKGCI/sBKDRhQNv+3t78+H BfzA== X-Gm-Message-State: APjAAAXPtkfVCk3S78Q62KdrTeWtRxpvGmD6mXvQwe6j8KHZEaxID2pb 9F6Cwa4dtrZ7CoLE+UK2Y5IE0AzBSvo= X-Received: by 2002:a1c:eb18:: with SMTP id j24mr14406088wmh.32.1555151689392; Sat, 13 Apr 2019 03:34:49 -0700 (PDT) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id h9sm8155844wmb.5.2019.04.13.03.34.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Apr 2019 03:34:48 -0700 (PDT) From: Srinivas Kandagatla To: gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, srinivas.kandagatla@linaro.org Subject: [PATCH] slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register Date: Sat, 13 Apr 2019 11:34:47 +0100 Message-Id: <20190413103447.10011-1-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kangjie Lu 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 --- drivers/slimbus/qcom-ngd-ctrl.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.21.0 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;