From patchwork Sun Jul 12 16:33:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajay Kumar X-Patchwork-Id: 11658669 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 994A6722 for ; Mon, 13 Jul 2020 04:13:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 6F15B20738 for ; Mon, 13 Jul 2020 04:13:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="e/HsLzne"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=samsung.com header.i=@samsung.com header.b="Jrg8M7jq" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F15B20738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=VmzgTrZdfpOuzdRx9ecs0rPzXMLxHju1dZMl6wf8T+o=; b=e/HsLzneT/LwkpaIlu8X/bqNOU 5VSZCE6M9Ol4z/uqzZu/tAClTKcT5H7PO4MlcmoHcx5Ju+cUluGBsXYuiKAn+mgUVfozPhEAa0zVa SyaEdn4I+WybDf8U3AGVI+MzZuILTnh9wDZxvPD7hAtGkNzsuXsKsRk8OZGR4mYRFp2Z2Q5PZpWeQ PeFl/uB9GBWEnW7c5A7zK08u4zkGqhVxS448WD6xdXpEuxHDXdqrIKiFFVp2Tzls1K/k2wtAreZm9 KD1nNrG7d0s7ucSdRfW6b0NpoNRKYsesyrAQkldoTMDGCLS0vxZummyChK5R3lIo53L1PnI3cyVcM 9O9/zxAw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jupp5-0007HR-LQ; Mon, 13 Jul 2020 04:12:11 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jupp3-0007GN-Jy for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2020 04:12:10 +0000 Received: from epcas5p2.samsung.com (unknown [182.195.41.40]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20200713041205epoutp03c79c783a226ce05ae7db318fdf6b0c85~hNI2Hi39q2084520845epoutp03K for ; Mon, 13 Jul 2020 04:12:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20200713041205epoutp03c79c783a226ce05ae7db318fdf6b0c85~hNI2Hi39q2084520845epoutp03K DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1594613525; bh=fxQwS3AxhcUkbjg5f3hjdLihYzP1TKbaxv6P2NHePcw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Jrg8M7jqWPVjkIzGIb52Axsa+iBvKiR4xcRG0bAT3/f6BAoW3fWW7wUN5ePHOr5cz e2Q0yyc+5jjNxMwP3XfhEk+RPfsdPez1RewaNzNjjRZUnnmp+NzPNCChApsxJSHdJ6 kjxOEg2dkcA/souSCfR4abxpaN+xtAEuciG/hRp4= Received: from epsmges5p1new.samsung.com (unknown [182.195.42.73]) by epcas5p4.samsung.com (KnoxPortal) with ESMTP id 20200713041205epcas5p4063713e366ffb6e52e4197b051c25a13~hNI1quIa30484304843epcas5p4K; Mon, 13 Jul 2020 04:12:05 +0000 (GMT) Received: from epcas5p3.samsung.com ( [182.195.41.41]) by epsmges5p1new.samsung.com (Symantec Messaging Gateway) with SMTP id E4.44.09467.41FDB0F5; Mon, 13 Jul 2020 13:12:04 +0900 (KST) Received: from epsmtrp1.samsung.com (unknown [182.195.40.13]) by epcas5p4.samsung.com (KnoxPortal) with ESMTPA id 20200712165527epcas5p4638d8f652d8d4d0ed1baba3962511681~hD6Eoc5fl2484324843epcas5p47; Sun, 12 Jul 2020 16:55:27 +0000 (GMT) Received: from epsmgms1p1new.samsung.com (unknown [182.195.42.41]) by epsmtrp1.samsung.com (KnoxPortal) with ESMTP id 20200712165527epsmtrp164f9ac1013ee5b32039ebe1f386b7864~hD6EnetS50161101611epsmtrp1k; Sun, 12 Jul 2020 16:55:27 +0000 (GMT) X-AuditID: b6c32a49-a3fff700000024fb-1b-5f0bdf14ab8b Received: from epsmtip2.samsung.com ( [182.195.34.31]) by epsmgms1p1new.samsung.com (Symantec Messaging Gateway) with SMTP id A9.40.08382.F704B0F5; Mon, 13 Jul 2020 01:55:27 +0900 (KST) Received: from Jaguar.sa.corp.samsungelectronics.net (unknown [107.108.73.139]) by epsmtip2.samsung.com (KnoxPortal) with ESMTPA id 20200712165526epsmtip2770a29f35f02167aaa8012942d999972~hD6DDUCMn1460814608epsmtip2i; Sun, 12 Jul 2020 16:55:26 +0000 (GMT) From: Ajay Kumar To: linux-arm-kernel@lists.infradead.org, robh+dt@kernel.org, mark.rutland@arm.com, will@kernel.org Subject: [PATCH 4/4] perf/smmuv3: fix crash when platdata not specified Date: Sun, 12 Jul 2020 22:03:41 +0530 Message-Id: <20200712163341.61410-5-ajaykumar.rs@samsung.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200712163341.61410-1-ajaykumar.rs@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpgleLIzCtJLcpLzFFi42LZdlhTU1f0Pne8wVMFiwPvD7JYPJi3jc2i c/YGdotNj6+xWiy9fpHJ4tuxGIvWvUfYLQ5+eMJqceThbnaL7VebWC1a7pg6cHs8OTiPyWPN vDWMHpf7epk8Wo68ZfXYtKqTzWPzknqPvi2rGAPYo7hsUlJzMstSi/TtErgypvRdZi+YwlGx dZ9bA+Nbti5GTg4JAROJJ7NfAtlcHEICuxklNm+czwjhfGKUmHXxITOE841R4mbnY0aYlsVX NjJBJPYySjybOAmqqoVJ4mXPUmaQKjYBbYlt02+ydDFycIgIpEqsXKUAUsMscIRR4tDl+2CT hAXcJX4tXQlWwyKgKtHcIwQS5hWwlfj+4xczxDJ5idUbDoDZnAJ2EpNWvGEFmSMh8JVdYkHL LFaIIheJa12foBqEJV4d38IOYUtJvOxvY4do6GeUeHr/DzOEs5pR4sHDC1Ad9hIHrswBu4JZ QFNi/S59iLCsxNRT65hAbGYBPone30+YIOK8EjvmgdgcQLaaxNYVfhBhGYkzB69AlXhIXDv1 CxooExkllm1fyDKBUW4WwoYFjIyrGCVTC4pz01OLTQsM81LL9YoTc4tL89L1kvNzNzGCE4mW 5w7Guw8+6B1iZOJgPMQowcGsJMIbLcoZL8SbklhZlVqUH19UmpNafIhRmoNFSZxX6ceZOCGB 9MSS1OzU1ILUIpgsEwenVANT0oydpubpM0TnLPjG4NLOPZFZRnmlxYGKyibx7Fn1c9Mtb1gI bi8ymFUvxBbd8f7h5KN2fTP4nq46uG2HZgRz0fKZ7j8fJMxxOf/tgdD2D3+7mP8JH1M6XWOk teRCbMcDjt+T78265jXxVNHU4AslU38/1lS8LqOvc0Ip+dC15DSXJKYfMiH73azCFL7o3zrz Pr846hJDSKZLYE/fbPWY+gsX9theLv/MuHDRxoyZ0x9OcXOYbN5auIRrpVyalozY9KaV3rkb pj8w23Xk4Ctj+YMdMs0rE51nu8avXRj8W7YxJ2y2Qsjr6hXbH8iphrSu/zlhgpdZp5L7nP9f 5c/caSq9ohwvecir8LVzJuMyJZbijERDLeai4kQAIXY5OZMDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrELMWRmVeSWpSXmKPExsWy7bCSvG69A3e8wd69xhYH3h9ksXgwbxub RefsDewWmx5fY7VYev0ik8W3YzEWrXuPsFsc/PCE1eLIw93sFtuvNrFatNwxdeD2eHJwHpPH mnlrGD0u9/UyebQcecvqsWlVJ5vH5iX1Hn1bVjEGsEdx2aSk5mSWpRbp2yVwZUzpu8xeMIWj Yus+twbGt2xdjJwcEgImEouvbGTqYuTiEBLYzSjxs3kVC0RCRuL5jqdQtrDEyn/P2SGKmpgk jp79yQ6SYBPQltg2/SZYkYhApsSfmyfZQIqYBc4wSiz/dR0sISzgLvFr6Uogm4ODRUBVorlH CCTMK2Ar8f3HL2aIBfISqzccALM5BewkJq14wwpiCwHVtL++xDKBkW8BI8MqRsnUguLc9Nxi wwLDvNRyveLE3OLSvHS95PzcTYzgYNXS3MG4fdUHvUOMTByMhxglOJiVRHijRTnjhXhTEiur Uovy44tKc1KLDzFKc7AoifPeKFwYJySQnliSmp2aWpBaBJNl4uCUamCK6uv52r1yYVzTsQ0H hOrybY6UnpNlN1wywTjn/DcJ8XUnH0SLb8/v2+1x55bCL7uGCaufp826ZdYvLJs0T3N619kV Gy3nmyqL3/jMtXDhoss2bku3HzAKjP7o+v/Rl8t731sUqVSnMthffXD06VO1K1eXzLHPyXzI 2fymPWrhBOaPlyJnXbZdxWHsdXl/MteFh3/Py5ksX1lSP6lHO39ioc2awsdHnTIjrNpaXGV+ 3jR8fGGh3z/LpRvS1z1zM9B7WOEhtdrb5c5+xt+up/9u0nt4XKAt4/TcACW1WTkacw98vPlK a/exu0xMz7+c93hjlmlQ+9VmyhvTjy9/7PG9X57jf+7fQ4mVjmsTl9yJ4ldiKc5INNRiLipO BADtKRz4xQIAAA== X-CMS-MailID: 20200712165527epcas5p4638d8f652d8d4d0ed1baba3962511681 X-Msg-Generator: CA X-Sendblock-Type: REQ_APPROVE CMS-TYPE: 105P X-CMS-RootMailID: 20200712165527epcas5p4638d8f652d8d4d0ed1baba3962511681 References: <20200712163341.61410-1-ajaykumar.rs@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200713_001209_885194_4A740BF1 X-CRM114-Status: GOOD ( 15.71 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [203.254.224.33 listed in wl.mailspike.net] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: shaik.ameer@samsung.com, nleeder@codeaurora.org, shameerali.kolothum.thodi@huawei.com, Ajay Kumar , alim.akhtar@samsung.com, robin.murphy@arm.com, joro@8bytes.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The arm_smmuv3_pmu driver assumes platform data is always available and exposes a possible NULL pointer deferencing at the below line. model = *(u32 *)dev_get_platdata(smmu_pmu->dev); This patch fixes the bug by adding a check prior to the deferencing of the platform data pointer. Signed-off-by: Ajay Kumar --- drivers/perf/arm_smmuv3_pmu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 25feab718c20..f7a27ae2f8d8 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c @@ -710,9 +710,10 @@ static void smmu_pmu_reset(struct smmu_pmu *smmu_pmu) static void smmu_pmu_get_acpi_options(struct smmu_pmu *smmu_pmu) { - u32 model; + u32 model = 0; - model = *(u32 *)dev_get_platdata(smmu_pmu->dev); + if (dev_get_platdata(smmu_pmu->dev)) + model = *(u32 *)dev_get_platdata(smmu_pmu->dev); switch (model) { case IORT_SMMU_V3_PMCG_HISI_HIP08: