This patchset includes 3 bug fixes changes to hisi PMU:
- Fix out-of-bound access when valid event group in hns pmu
- Fixes the memory leak in hns pmu
- Fix out-of-bound access when valid event group in pcie pmu
Hao Chen (1):
drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
Junhao He (2):
drivers/perf: hisi_pcie: Fix out-of-bound access when valid event
group
drivers/perf: hisi: hns3: Fix out-of-bound access when valid event
group
drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +++++++++++++-
drivers/perf/hisilicon/hns3_pmu.c | 16 ++++++++++++++--
2 files changed, 27 insertions(+), 3 deletions(-)
--
2.33.0
From: Hao Chen <[email protected]>
pci_alloc_irq_vectors() allocates an irq vector. When devm_add_action()
fails, the irq vector is not freed, which leads to a memory leak.
Replace the devm_add_action with devm_add_action_or_reset to ensure
the irq vector can be destroyed when it fails.
Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU")
Signed-off-by: Hao Chen <[email protected]>
Signed-off-by: Junhao He <[email protected]>
---
drivers/perf/hisilicon/hns3_pmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c
index cbdd53b0a034..60062eaa342a 100644
--- a/drivers/perf/hisilicon/hns3_pmu.c
+++ b/drivers/perf/hisilicon/hns3_pmu.c
@@ -1527,7 +1527,7 @@ static int hns3_pmu_irq_register(struct pci_dev *pdev,
return ret;
}
- ret = devm_add_action(&pdev->dev, hns3_pmu_free_irq, pdev);
+ ret = devm_add_action_or_reset(&pdev->dev, hns3_pmu_free_irq, pdev);
if (ret) {
pci_err(pdev, "failed to add free irq action, ret = %d.\n", ret);
return ret;
--
2.33.0
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 HISI_PCIE_MAX_COUNTERS, 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: 8404b0fbc7fb ("drivers/perf: hisi: Add driver for HiSilicon PCIe PMU")
Signed-off-by: Junhao He <[email protected]>
---
drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c
index 5d1f0e9fdb08..dba399125658 100644
--- a/drivers/perf/hisilicon/hisi_pcie_pmu.c
+++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c
@@ -350,15 +350,27 @@ static bool hisi_pcie_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 (hisi_pcie_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 == HISI_PCIE_MAX_COUNTERS)
+ return false;
+
if (num == counters)
event_group[counters++] = sibling;
}
- return counters <= HISI_PCIE_MAX_COUNTERS;
+ return true;
}
static int hisi_pcie_pmu_event_init(struct perf_event *event)
--
2.33.0
Reviewed-by: Jijie Shao<[email protected]>
on 2024/4/25 20:46, Junhao He wrote:
> From: Hao Chen <[email protected]>
>
> pci_alloc_irq_vectors() allocates an irq vector. When devm_add_action()
> fails, the irq vector is not freed, which leads to a memory leak.
>
> Replace the devm_add_action with devm_add_action_or_reset to ensure
> the irq vector can be destroyed when it fails.
>
> Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU")
> Signed-off-by: Hao Chen <[email protected]>
> Signed-off-by: Junhao He <[email protected]>
> ---
> drivers/perf/hisilicon/hns3_pmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c
> index cbdd53b0a034..60062eaa342a 100644
> --- a/drivers/perf/hisilicon/hns3_pmu.c
> +++ b/drivers/perf/hisilicon/hns3_pmu.c
> @@ -1527,7 +1527,7 @@ static int hns3_pmu_irq_register(struct pci_dev *pdev,
> return ret;
> }
>
> - ret = devm_add_action(&pdev->dev, hns3_pmu_free_irq, pdev);
> + ret = devm_add_action_or_reset(&pdev->dev, hns3_pmu_free_irq, pdev);
> if (ret) {
> pci_err(pdev, "failed to add free irq action, ret = %d.\n", ret);
> return ret;
Reviewed-by: Jijie Shao<[email protected]>
on 2024/4/25 20:46, Junhao He wrote:
> 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 HISI_PCIE_MAX_COUNTERS, 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: 8404b0fbc7fb ("drivers/perf: hisi: Add driver for HiSilicon PCIe PMU")
> Signed-off-by: Junhao He <[email protected]>
> ---
> drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c
> index 5d1f0e9fdb08..dba399125658 100644
> --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c
> +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c
> @@ -350,15 +350,27 @@ static bool hisi_pcie_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 (hisi_pcie_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 == HISI_PCIE_MAX_COUNTERS)
> + return false;
> +
> if (num == counters)
> event_group[counters++] = sibling;
> }
>
> - return counters <= HISI_PCIE_MAX_COUNTERS;
> + return true;
> }
>
> static int hisi_pcie_pmu_event_init(struct perf_event *event)
On Thu, 25 Apr 2024 20:46:27 +0800
Junhao He <[email protected]> wrote:
> From: Hao Chen <[email protected]>
>
> pci_alloc_irq_vectors() allocates an irq vector. When devm_add_action()
> fails, the irq vector is not freed, which leads to a memory leak.
>
> Replace the devm_add_action with devm_add_action_or_reset to ensure
> the irq vector can be destroyed when it fails.
>
> Fixes: 66637ab137b4 ("drivers/perf: hisi: add driver for HNS3 PMU")
> Signed-off-by: Hao Chen <[email protected]>
> Signed-off-by: Junhao He <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Thanks,
> ---
> drivers/perf/hisilicon/hns3_pmu.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c
> index cbdd53b0a034..60062eaa342a 100644
> --- a/drivers/perf/hisilicon/hns3_pmu.c
> +++ b/drivers/perf/hisilicon/hns3_pmu.c
> @@ -1527,7 +1527,7 @@ static int hns3_pmu_irq_register(struct pci_dev *pdev,
> return ret;
> }
>
> - ret = devm_add_action(&pdev->dev, hns3_pmu_free_irq, pdev);
> + ret = devm_add_action_or_reset(&pdev->dev, hns3_pmu_free_irq, pdev);
> if (ret) {
> pci_err(pdev, "failed to add free irq action, ret = %d.\n", ret);
> return ret;
On Thu, 25 Apr 2024 20:46:25 +0800
Junhao He <[email protected]> wrote:
> 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 HISI_PCIE_MAX_COUNTERS, 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: 8404b0fbc7fb ("drivers/perf: hisi: Add driver for HiSilicon PCIe PMU")
> Signed-off-by: Junhao He <[email protected]>
Acked-by: Jonathan Cameron <[email protected]>
Thanks,
> ---
> drivers/perf/hisilicon/hisi_pcie_pmu.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/perf/hisilicon/hisi_pcie_pmu.c b/drivers/perf/hisilicon/hisi_pcie_pmu.c
> index 5d1f0e9fdb08..dba399125658 100644
> --- a/drivers/perf/hisilicon/hisi_pcie_pmu.c
> +++ b/drivers/perf/hisilicon/hisi_pcie_pmu.c
> @@ -350,15 +350,27 @@ static bool hisi_pcie_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 (hisi_pcie_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 == HISI_PCIE_MAX_COUNTERS)
> + return false;
> +
> if (num == counters)
> event_group[counters++] = sibling;
> }
>
> - return counters <= HISI_PCIE_MAX_COUNTERS;
> + return true;
> }
>
> static int hisi_pcie_pmu_event_init(struct perf_event *event)
On Thu, 25 Apr 2024 20:46:24 +0800, Junhao He wrote:
> This patchset includes 3 bug fixes changes to hisi PMU:
> - Fix out-of-bound access when valid event group in hns pmu
> - Fixes the memory leak in hns pmu
> - Fix out-of-bound access when valid event group in pcie pmu
>
> Hao Chen (1):
> drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
>
> [...]
Applied to will (for-next/perf), thanks!
[1/3] drivers/perf: hisi_pcie: Fix out-of-bound access when valid event group
https://git.kernel.org/will/c/77fce82678ea
[2/3] drivers/perf: hisi: hns3: Fix out-of-bound access when valid event group
https://git.kernel.org/will/c/81bdd60a3d1d
[3/3] drivers/perf: hisi: hns3: Actually use devm_add_action_or_reset()
https://git.kernel.org/will/c/582c1aeee0a9
Cheers,
--
Will
https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev