drm/amdgpu/pm: Check input value for CUSTOM profile mode setting on legacy SOCs

From Ma Jun
58350786dbbddfb5ffcbb0ef976b5c9fef5870bc in linux-6.6.y/6.6.50
df0a9bd92fbbd3fcafcb2bce6463c9228a3e6868 in mainline linux

diff --git a/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c b/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
index 4cd7e0e..bda5f16 100644 (file)
--- a/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
+++ b/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c
@@ -5641,7 +5641,7 @@ static int smu7_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uint
        mode = input[size];
        switch (mode) {
        case PP_SMC_POWER_PROFILE_CUSTOM:
-               if (size < 8 && size != 0)
+               if (size != 8 && size != 0)
                        return -EINVAL;
                /* If only CUSTOM is passed in, use the saved values. Check
                 * that we actually have a CUSTOM profile by ensuring that

diff --git a/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c b/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
index bd144d6..9803643 100644 (file)
--- a/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
+++ b/sys/dev/pci/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
@@ -4102,9 +4102,11 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui
        if (power_profile_mode == PP_SMC_POWER_PROFILE_CUSTOM) {
                struct vega20_hwmgr *data =
                        (struct vega20_hwmgr *)(hwmgr->backend);
-               if (size == 0 && !data->is_custom_profile_set)
+
+               if (size != 10 && size != 0)
                        return -EINVAL;
-               if (size < 10 && size != 0)
+
+               if (size == 0 && !data->is_custom_profile_set)
                        return -EINVAL;
 
                result = vega20_get_activity_monitor_coeff(hwmgr,
@@ -4166,6 +4168,8 @@ static int vega20_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, ui
                        activity_monitor.Fclk_PD_Data_error_coeff = input[8];
                        activity_monitor.Fclk_PD_Data_error_rate_coeff = input[9];
                        break;
+               default:
+                       return -EINVAL;
                }
 
                result = vega20_set_activity_monitor_coeff(hwmgr,