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=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_2 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 35ABEC433E1 for ; Mon, 13 Jul 2020 08:48:58 +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 F0CB82065D for ; Mon, 13 Jul 2020 08:48:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uSzc9WrS" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0CB82065D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=Huawei.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SITFFQFhEPHCPgNt1AWYtgdrcS53FJ9HPNQBw3B+w8Q=; b=uSzc9WrSByy6m2WfD1WdXCDE/ L/ye8bFnY5kHJVxDG/A0SeIC8j5O4ybnTukqTq8/eD/hHH5hxIp3fzqWWDyZXi0Q2SIa0oDMHfaX1 KDrdMczgTyYyuDnEc0nBBMmDPLVc/eKqJFa4vNK+NrT6UN1dA7d6qr2SGO7i7uaq8cfTYpNuhvB9T PQuvJ3bXzMsvKFDEqHrnTnMnuklJkFdXbNTgAoCWS5pX2zchPUjRcoRWMZhuDbMp/HfTD9yrS2l+O joizN003pYdjlAPnTAPnAKnAURJpaWk2dJd96UDSx3U6onKemeLtbNupM4RhfbYyaNBJzcSFlIRd5 iEbj7y7BQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1juu7d-0001Pa-EJ; Mon, 13 Jul 2020 08:47:37 +0000 Received: from lhrrgout.huawei.com ([185.176.76.210] helo=huawei.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1juu7a-0001Ow-Ny for linux-arm-kernel@lists.infradead.org; Mon, 13 Jul 2020 08:47:35 +0000 Received: from lhreml710-chm.china.huawei.com (unknown [172.18.7.108]) by Forcepoint Email with ESMTP id EA90E3276020CD8154D5; Mon, 13 Jul 2020 09:47:32 +0100 (IST) Received: from localhost (10.52.126.116) by lhreml710-chm.china.huawei.com (10.201.108.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1913.5; Mon, 13 Jul 2020 09:47:32 +0100 Date: Mon, 13 Jul 2020 09:46:25 +0100 From: Jonathan Cameron To: Ajay Kumar Subject: Re: [PATCH 4/4] perf/smmuv3: fix crash when platdata not specified Message-ID: <20200713094625.00002bb7@Huawei.com> In-Reply-To: <20200712163341.61410-5-ajaykumar.rs@samsung.com> References: <20200712163341.61410-1-ajaykumar.rs@samsung.com> <20200712163341.61410-5-ajaykumar.rs@samsung.com> Organization: Huawei Technologies Research and Development (UK) Ltd. X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; i686-w64-mingw32) MIME-Version: 1.0 X-Originating-IP: [10.52.126.116] X-ClientProxiedBy: lhreml713-chm.china.huawei.com (10.201.108.64) To lhreml710-chm.china.huawei.com (10.201.108.61) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200713_044734_903427_6E00A9CB X-CRM114-Status: GOOD ( 16.20 ) 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: mark.rutland@arm.com, shaik.ameer@samsung.com, robin.murphy@arm.com, nleeder@codeaurora.org, shameerali.kolothum.thodi@huawei.com, robh+dt@kernel.org, alim.akhtar@samsung.com, will@kernel.org, joro@8bytes.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Sun, 12 Jul 2020 22:03:41 +0530 Ajay Kumar wrote: > 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; Use the generic model define. Sure it's 0, but good to make it clear what the meaning of this default is. It also seems likely you hit this because of you were using dt. If so, it seems 'odd' to be running a function explicitly mentioning acpi in it's name. Also, should do this before introducing support that might lead to this path so as not to cause bisection problems. Jonathan > > - 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: _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel