From 6a7096268fe54cebabbeb25e9f9e92750fb9e651 Mon Sep 17 00:00:00 2001 From: Wang ShaoBo Date: Thu, 30 Nov 2023 21:59:50 +0800 Subject: [PATCH 1/2] arm64/mpam: Fix uninitialized symbol ret hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8EF0Z -------------------------------- This fix compile error: arch/arm64/kernel/mpam/mpam_ctrlmon.c:793 resctrl_mkdir_mondata_all_subdir() error: uninitialized symbol 'ret'. Fixes: 037915d24c0a ("arm64/mpam: resctrl: Remove ctrlmon sysfile") Signed-off-by: Wang ShaoBo Signed-off-by: Jialin Zhang --- arch/arm64/kernel/mpam/mpam_ctrlmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mpam/mpam_ctrlmon.c b/arch/arm64/kernel/mpam/mpam_ctrlmon.c index 8abbf2823269..7a0fec297856 100644 --- a/arch/arm64/kernel/mpam/mpam_ctrlmon.c +++ b/arch/arm64/kernel/mpam/mpam_ctrlmon.c @@ -769,7 +769,7 @@ int resctrl_mkdir_mondata_all_subdir(struct kernfs_node *parent_kn, { struct resctrl_schema *s; struct resctrl_resource *r; - int ret; + int ret = 0; /* * Create the subdirectories for each domain. Note that all events -- Gitee From 4ec1ff116ac29e1687b6761c70648c133b015783 Mon Sep 17 00:00:00 2001 From: Wang ShaoBo Date: Thu, 30 Nov 2023 21:59:51 +0800 Subject: [PATCH 2/2] arm64/mpam: Fix buffer overflow in mpam_handle_error_irq() hulk inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/I8EF0Z -------------------------------- Fix buffer overflow in mpam_handle_error_irq(): mpam_handle_error_irq() error: buffer overflow 'mpam_msc_err_str' 8 <= 8 Fixes: 44513976e11e ("arm64/mpam: Enabling registering and logging error interrupts") Signed-off-by: Wang ShaoBo Signed-off-by: Jialin Zhang --- arch/arm64/kernel/mpam/mpam_device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/kernel/mpam/mpam_device.c b/arch/arm64/kernel/mpam/mpam_device.c index b3de7f518423..19c49f76d0e5 100644 --- a/arch/arm64/kernel/mpam/mpam_device.c +++ b/arch/arm64/kernel/mpam/mpam_device.c @@ -439,7 +439,7 @@ static irqreturn_t mpam_handle_error_irq(int irq, void *data) return IRQ_NONE; /* No-one expects MPAM errors! */ - if (device_errcode <= _MPAM_NUM_ERRCODE) + if (device_errcode < _MPAM_NUM_ERRCODE) pr_err_ratelimited("unexpected error '%s' [esr:%x]\n", mpam_msc_err_str[device_errcode], device_esr); -- Gitee