1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 15a1192c1ec5..8f98629fbe59 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -31,7 +31,7 @@
 #include <linux/power_supply.h>
 #include <linux/hwmon.h>
 #include <linux/hwmon-sysfs.h>
-
+#include <linux/nospec.h>
 
 static int amdgpu_debugfs_pm_init(struct amdgpu_device *adev);
 
@@ -403,6 +403,7 @@ static ssize_t amdgpu_set_pp_force_state(struct device *dev,
                         count = -EINVAL;
                         goto fail;
                 }
+                idx = array_index_nospec(idx, ARRAY_SIZE(data.states));
 
                 amdgpu_dpm_get_pp_num_states(adev, &data);
                 state = data.states[idx];
@@ -1185,7 +1186,7 @@ static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,
         int r, size = sizeof(vddnb);
 
         /* only APUs have vddnb */
-        if  (adev->flags & AMD_IS_APU)
+        if  (!(adev->flags & AMD_IS_APU))
                 return -EINVAL;
 
         /* Can't get voltage when the card is off */