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,USER_AGENT_GIT autolearn=unavailable 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 06CAFC072B1 for ; Thu, 30 May 2019 04:12:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C890B239B8 for ; Thu, 30 May 2019 04:12:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559189562; bh=I5csH4V8mLaYJl8pLwmMuS2+jOoRE1fhsLHCEUi8Cps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K7OcLqXM9dlxpjuHXjo0qRkhdJS8L2BKyOKJWArS+51zmHgmuWk6e6JQ3VPm8fWDO mxegPeeyHHI1O8Q2oilR/KSZ15GPjlARcpcYEtFaTIkki/QIUKc5zhaOmpT10p1rW8 eTb7ujVC9VAJQ+nnuWbIlnIBFSl4s62QWfGETI4I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730715AbfE3DQd (ORCPT ); Wed, 29 May 2019 23:16:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:42876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730703AbfE3DQc (ORCPT ); Wed, 29 May 2019 23:16:32 -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 B156924590; Thu, 30 May 2019 03:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1559186191; bh=I5csH4V8mLaYJl8pLwmMuS2+jOoRE1fhsLHCEUi8Cps=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KKtZ+p4Lt9EKoRX+h5zCNGLwGKFdrlIGTN1z9YXHKdTmMGaJyknl5bLv+/ddqXjBQ CtpgbMFFhuOCHc0HmrwDTvBYQyjgqtQrbTTLtVk26CEURiCihUnGqHJEdabCGVMtkQ /4hDmQsosuHVBhGNxVHxV112xXsN5OISJG71OYPk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Madhavan Srinivasan , Anju T Sudhakar , Michael Ellerman , Sasha Levin Subject: [PATCH 4.19 062/276] powerpc/perf: Return accordingly on invalid chip-id in Date: Wed, 29 May 2019 20:03:40 -0700 Message-Id: <20190530030529.658403050@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: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit a913e5e8b43be1d3897a141ce61c1ec071cad89c ] Nest hardware counter memory resides in a per-chip reserve-memory. During nest_imc_event_init(), chip-id of the event-cpu is considered to calculate the base memory addresss for that cpu. Return, proper error condition if the chip_id calculated is invalid. Reported-by: Dan Carpenter Fixes: 885dcd709ba91 ("powerpc/perf: Add nest IMC PMU support") Reviewed-by: Madhavan Srinivasan Signed-off-by: Anju T Sudhakar Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/perf/imc-pmu.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index 1fafc32b12a0f..3cebfdf362116 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c @@ -496,6 +496,11 @@ static int nest_imc_event_init(struct perf_event *event) * Get the base memory addresss for this cpu. */ chip_id = cpu_to_chip_id(event->cpu); + + /* Return, if chip_id is not valid */ + if (chip_id < 0) + return -ENODEV; + pcni = pmu->mem_info; do { if (pcni->id == chip_id) { -- 2.20.1