From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 643F7197A8F; Thu, 6 Jun 2024 14:14:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683282; cv=none; b=AE0TH9kyWcsZh/ItmVpRpHd7yTJ6ta5v7O6zH9FTTd//b+jCrqwQlwfpV+B4Rwi9WoBqpP4sP5TZhCUfTskvbQzIQT/6v4P0IX0JfVoQ2n60ezEI4TD+/14p7pfl+JGnzjdOGiC7pX2IMVRF4Lqxa9RmIEV2ZAw9PFHdW7fNrEw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717683282; c=relaxed/simple; bh=xx9icGSRU8GcDmcHp6FarrgHSQ3OEtspRbrygO3EjaI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nQY3FUJP25W2sHbzOTplyd5d1LeSoBI6D+bvXB04+6GzXtbufQ+VpFznjQSO9CcB1MwSRCjswt7IcRF+lCeshRbWvVo8iHBsJBPmn5+a+hY5JDeRaE1+qY6GcUilXmrsJajMBpnl06vtvvKWf6eLhw9NOO0prosxvG0vyxgxJ3Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gIVdma5G; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gIVdma5G" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40D95C32781; Thu, 6 Jun 2024 14:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717683282; bh=xx9icGSRU8GcDmcHp6FarrgHSQ3OEtspRbrygO3EjaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gIVdma5GAxhup8PJTFCGGbWGXYEYRSoAnZVJBtVjY9owwsD4i5NunuRJD6LK0QCVm oF5QQgYGbbfr6a5GvG8NK81mLqf0JjjZ+P41rpoQVnE40038UGAyR30IwkuQnMhxTm soh1+pll0/uwnlqZ9Ol3bZ4mi2H750MXhWxfWaZM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Junhao He , Hao Chen , Jonathan Cameron , Jijie Shao , Will Deacon , Sasha Levin Subject: [PATCH 6.6 206/744] drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group Date: Thu, 6 Jun 2024 15:57:58 +0200 Message-ID: <20240606131739.014145782@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131732.440653204@linuxfoundation.org> References: <20240606131732.440653204@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Junhao He [ Upstream commit 81bdd60a3d1d3b05e6cc6674845afb1694dd3a0e ] The perf tool allows users to create event groups through following cmd [1], but the driver does not check whether the array index is out of bounds when writing data to the event_group array. If the number of events in an event_group is greater than HNS3_PMU_MAX_HW_EVENTS, the memory write overflow of event_group array occurs. Add array index check to fix the possible array out of bounds violation, and return directly when write new events are written to array bounds. There are 9 different events in an event_group. [1] perf stat -e '{pmu/event1/, ... ,pmu/event9/} Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU") Signed-off-by: Junhao He Signed-off-by: Hao Chen Acked-by: Jonathan Cameron Reviewed-by: Jijie Shao Link: https://lore.kernel.org/r/20240425124627.13764-3-hejunhao3@huawei.com Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/hisilicon/hns3_pmu.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c index 16869bf5bf4cc..cbdd53b0a0342 100644 --- a/drivers/perf/hisilicon/hns3_pmu.c +++ b/drivers/perf/hisilicon/hns3_pmu.c @@ -1085,15 +1085,27 @@ static bool hns3_pmu_validate_event_group(struct perf_event *event) return false; for (num = 0; num < counters; num++) { + /* + * If we find a related event, then it's a valid group + * since we don't need to allocate a new counter for it. + */ if (hns3_pmu_cmp_event(event_group[num], sibling)) break; } + /* + * Otherwise it's a new event but if there's no available counter, + * fail the check since we cannot schedule all the events in + * the group simultaneously. + */ + if (num == HNS3_PMU_MAX_HW_EVENTS) + return false; + if (num == counters) event_group[counters++] = sibling; } - return counters <= HNS3_PMU_MAX_HW_EVENTS; + return true; } static u32 hns3_pmu_get_filter_condition(struct perf_event *event) -- 2.43.0