drm/amdgpu/si: Fix buffer overflow in si_get_register_value()
Subsystems (3)
PATCH 1/3 drm/amdgpu/si: Fix buffer overflow in si_get_register_value()
The values for "se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more than AMDGPU_GFX_MAX_SE (4) or AMDGPU_GFX_MAX_SH_PER_SE (2) then it results in an out of bounds read.
I split this function into to two to make the error handling simpler.
--- drivers/gpu/drm/amd/amdgpu/si.c | 157 +++++++++++++++++--------------- 1 file changed, 85 insertions(+), 72 deletions(-)
drivers/gpu/drm/amd/amdgpu/si.c +85 -72
@@ -1051,81 +1051,90 @@ static struct amdgpu_allowed_register_entry si_allowed_read_registers[] = { {PA_SC_RASTER_CONFIG, true}, }; -static uint32_t si_get_register_value (struct amdgpu_device *adev, -bool indexed,u32 se_num, -u32 sh_num,u32 reg_offset) -{ -if (indexed) { -uint32_t val; -unsigned se_idx = (se_num =0xffffffff ) ?0 : se_num; -unsigned sh_idx = (sh_num =0xffffffff ) ?0 : sh_num; - -switch (reg_offset) { -case mmCC_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; -case mmGC_USER_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; -case mmPA_SC_RASTER_CONFIG: -return adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; - } +static int si_get_register_value_indexed (struct amdgpu_device *adev, +u32 se_num,u32 sh_num, +u32 reg_offset,u32 *value) +{ +unsigned se_idx = (se_num =0xffffffff ) ?0 : se_num; +unsigned sh_idx = (sh_num =0xffffffff ) ?0 : sh_num; -mutex_lock (&adev->grbm_idx_mutex); -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); +if (se_idx >=AMDGPU_GFX_MAX_SE || + sh_idx >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ; - val =RREG32 (reg_offset); +switch (reg_offset) { +case mmCC_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; +return 0 ; +case mmGC_USER_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; +return 0 ; +case mmPA_SC_RASTER_CONFIG: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; +return 0 ; + } -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); -mutex_unlock (&adev->grbm_idx_mutex); -return val; - }else { -unsigned idx; - -switch (reg_offset) { -case mmGB_ADDR_CONFIG: -return adev->gfx.config.gb_addr_config; -case mmMC_ARB_RAMCFG: -return adev->gfx.config.mc_arb_ramcfg; -case mmGB_TILE_MODE0: -case mmGB_TILE_MODE1: -case mmGB_TILE_MODE2: -case mmGB_TILE_MODE3: -case mmGB_TILE_MODE4: -case mmGB_TILE_MODE5: -case mmGB_TILE_MODE6: -case mmGB_TILE_MODE7: -case mmGB_TILE_MODE8: -case mmGB_TILE_MODE9: -case mmGB_TILE_MODE10: -case mmGB_TILE_MODE11: -case mmGB_TILE_MODE12: -case mmGB_TILE_MODE13: -case mmGB_TILE_MODE14: -case mmGB_TILE_MODE15: -case mmGB_TILE_MODE16: -case mmGB_TILE_MODE17: -case mmGB_TILE_MODE18: -case mmGB_TILE_MODE19: -case mmGB_TILE_MODE20: -case mmGB_TILE_MODE21: -case mmGB_TILE_MODE22: -case mmGB_TILE_MODE23: -case mmGB_TILE_MODE24: -case mmGB_TILE_MODE25: -case mmGB_TILE_MODE26: -case mmGB_TILE_MODE27: -case mmGB_TILE_MODE28: -case mmGB_TILE_MODE29: -case mmGB_TILE_MODE30: -case mmGB_TILE_MODE31: - idx = (reg_offset - mmGB_TILE_MODE0); -return adev->gfx.config.tile_mode_array[idx]; -default : -return RREG32 (reg_offset); - } +mutex_lock (&adev->grbm_idx_mutex); +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); + + *value =RREG32 (reg_offset); + +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); +mutex_unlock (&adev->grbm_idx_mutex); +return 0 ; +} + +static uint32_t si_get_register_value (struct amdgpu_device *adev, +u32 reg_offset) +{ +unsigned idx; + +switch (reg_offset) { +case mmGB_ADDR_CONFIG: +return adev->gfx.config.gb_addr_config; +case mmMC_ARB_RAMCFG: +return adev->gfx.config.mc_arb_ramcfg; +case mmGB_TILE_MODE0: +case mmGB_TILE_MODE1: +case mmGB_TILE_MODE2: +case mmGB_TILE_MODE3: +case mmGB_TILE_MODE4: +case mmGB_TILE_MODE5: +case mmGB_TILE_MODE6: +case mmGB_TILE_MODE7: +case mmGB_TILE_MODE8: +case mmGB_TILE_MODE9: +case mmGB_TILE_MODE10: +case mmGB_TILE_MODE11: +case mmGB_TILE_MODE12: +case mmGB_TILE_MODE13: +case mmGB_TILE_MODE14: +case mmGB_TILE_MODE15: +case mmGB_TILE_MODE16: +case mmGB_TILE_MODE17: +case mmGB_TILE_MODE18: +case mmGB_TILE_MODE19: +case mmGB_TILE_MODE20: +case mmGB_TILE_MODE21: +case mmGB_TILE_MODE22: +case mmGB_TILE_MODE23: +case mmGB_TILE_MODE24: +case mmGB_TILE_MODE25: +case mmGB_TILE_MODE26: +case mmGB_TILE_MODE27: +case mmGB_TILE_MODE28: +case mmGB_TILE_MODE29: +case mmGB_TILE_MODE30: +case mmGB_TILE_MODE31: + idx = (reg_offset - mmGB_TILE_MODE0); +return adev->gfx.config.tile_mode_array[idx]; +default : +return RREG32 (reg_offset); } } +static int si_read_register (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 reg_offset,u32 *value) {
@@ -1138,8 +1147,12 @@ static int si_read_register(struct amdgpu_device *adev, u32 se_num,if (reg_offset != si_allowed_read_registers[i].reg_offset)continue ; - *value =si_get_register_value (adev, indexed, se_num, sh_num, - reg_offset); +if (indexed) +return si_get_register_value_indexed (adev, + se_num, sh_num, + reg_offset, value); + + *value =si_get_register_value (adev, reg_offset);return 0 ; }return -EINVAL ;
Signature · 1 line
2.28.0
PATCH 2/3 drm/amdgpu/cik: fix buffer overflow in cik_get_register_value()
The values for "se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more than AMDGPU_GFX_MAX_SE (4) or AMDGPU_GFX_MAX_SH_PER_SE (2) then it results in an out of bounds read.
I split this function into to two to make the error handling simpler.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 195 ++++++++++++++++--------------- 1 file changed, 103 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +103 -92
@@ -1042,100 +1042,108 @@ static const struct amdgpu_allowed_register_entry cik_allowed_read_registers[] {mmPA_SC_RASTER_CONFIG_1, true}, }; +static int cik_get_register_value_indexed (struct amdgpu_device *adev, +u32 se_num,u32 sh_num, +u32 reg_offset,u32 *value) +{ +unsigned se_idx = (se_num =0xffffffff ) ?0 : se_num; +unsigned sh_idx = (sh_num =0xffffffff ) ?0 : sh_num; -static uint32_t cik_get_register_value (struct amdgpu_device *adev, -bool indexed,u32 se_num, -u32 sh_num,u32 reg_offset) -{ -if (indexed) { -uint32_t val; -unsigned se_idx = (se_num =0xffffffff ) ?0 : se_num; -unsigned sh_idx = (sh_num =0xffffffff ) ?0 : sh_num; - -switch (reg_offset) { -case mmCC_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; -case mmGC_USER_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; -case mmPA_SC_RASTER_CONFIG: -return adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; -case mmPA_SC_RASTER_CONFIG_1: -return adev->gfx.config.rb_config[se_idx][sh_idx].raster_config_1; - } +if (se_idx >=AMDGPU_GFX_MAX_SE || + sh_idx >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ; + +switch (reg_offset) { +case mmCC_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; +return 0 ; +case mmGC_USER_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; +return 0 ; +case mmPA_SC_RASTER_CONFIG: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; +return 0 ; +case mmPA_SC_RASTER_CONFIG_1: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].raster_config_1; +return 0 ; + } -mutex_lock (&adev->grbm_idx_mutex); -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); +mutex_lock (&adev->grbm_idx_mutex); +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); - val =RREG32 (reg_offset); + *value =RREG32 (reg_offset); -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); -mutex_unlock (&adev->grbm_idx_mutex); -return val; - }else { -unsigned idx; - -switch (reg_offset) { -case mmGB_ADDR_CONFIG: -return adev->gfx.config.gb_addr_config; -case mmMC_ARB_RAMCFG: -return adev->gfx.config.mc_arb_ramcfg; -case mmGB_TILE_MODE0: -case mmGB_TILE_MODE1: -case mmGB_TILE_MODE2: -case mmGB_TILE_MODE3: -case mmGB_TILE_MODE4: -case mmGB_TILE_MODE5: -case mmGB_TILE_MODE6: -case mmGB_TILE_MODE7: -case mmGB_TILE_MODE8: -case mmGB_TILE_MODE9: -case mmGB_TILE_MODE10: -case mmGB_TILE_MODE11: -case mmGB_TILE_MODE12: -case mmGB_TILE_MODE13: -case mmGB_TILE_MODE14: -case mmGB_TILE_MODE15: -case mmGB_TILE_MODE16: -case mmGB_TILE_MODE17: -case mmGB_TILE_MODE18: -case mmGB_TILE_MODE19: -case mmGB_TILE_MODE20: -case mmGB_TILE_MODE21: -case mmGB_TILE_MODE22: -case mmGB_TILE_MODE23: -case mmGB_TILE_MODE24: -case mmGB_TILE_MODE25: -case mmGB_TILE_MODE26: -case mmGB_TILE_MODE27: -case mmGB_TILE_MODE28: -case mmGB_TILE_MODE29: -case mmGB_TILE_MODE30: -case mmGB_TILE_MODE31: - idx = (reg_offset - mmGB_TILE_MODE0); -return adev->gfx.config.tile_mode_array[idx]; -case mmGB_MACROTILE_MODE0: -case mmGB_MACROTILE_MODE1: -case mmGB_MACROTILE_MODE2: -case mmGB_MACROTILE_MODE3: -case mmGB_MACROTILE_MODE4: -case mmGB_MACROTILE_MODE5: -case mmGB_MACROTILE_MODE6: -case mmGB_MACROTILE_MODE7: -case mmGB_MACROTILE_MODE8: -case mmGB_MACROTILE_MODE9: -case mmGB_MACROTILE_MODE10: -case mmGB_MACROTILE_MODE11: -case mmGB_MACROTILE_MODE12: -case mmGB_MACROTILE_MODE13: -case mmGB_MACROTILE_MODE14: -case mmGB_MACROTILE_MODE15: - idx = (reg_offset - mmGB_MACROTILE_MODE0); -return adev->gfx.config.macrotile_mode_array[idx]; -default : -return RREG32 (reg_offset); - } +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); +mutex_unlock (&adev->grbm_idx_mutex); +return 0 ; +} + +static uint32_t cik_get_register_value (struct amdgpu_device *adev, +u32 reg_offset) +{ +unsigned idx; + +switch (reg_offset) { +case mmGB_ADDR_CONFIG: +return adev->gfx.config.gb_addr_config; +case mmMC_ARB_RAMCFG: +return adev->gfx.config.mc_arb_ramcfg; +case mmGB_TILE_MODE0: +case mmGB_TILE_MODE1: +case mmGB_TILE_MODE2: +case mmGB_TILE_MODE3: +case mmGB_TILE_MODE4: +case mmGB_TILE_MODE5: +case mmGB_TILE_MODE6: +case mmGB_TILE_MODE7: +case mmGB_TILE_MODE8: +case mmGB_TILE_MODE9: +case mmGB_TILE_MODE10: +case mmGB_TILE_MODE11: +case mmGB_TILE_MODE12: +case mmGB_TILE_MODE13: +case mmGB_TILE_MODE14: +case mmGB_TILE_MODE15: +case mmGB_TILE_MODE16: +case mmGB_TILE_MODE17: +case mmGB_TILE_MODE18: +case mmGB_TILE_MODE19: +case mmGB_TILE_MODE20: +case mmGB_TILE_MODE21: +case mmGB_TILE_MODE22: +case mmGB_TILE_MODE23: +case mmGB_TILE_MODE24: +case mmGB_TILE_MODE25: +case mmGB_TILE_MODE26: +case mmGB_TILE_MODE27: +case mmGB_TILE_MODE28: +case mmGB_TILE_MODE29: +case mmGB_TILE_MODE30: +case mmGB_TILE_MODE31: + idx = (reg_offset - mmGB_TILE_MODE0); +return adev->gfx.config.tile_mode_array[idx]; +case mmGB_MACROTILE_MODE0: +case mmGB_MACROTILE_MODE1: +case mmGB_MACROTILE_MODE2: +case mmGB_MACROTILE_MODE3: +case mmGB_MACROTILE_MODE4: +case mmGB_MACROTILE_MODE5: +case mmGB_MACROTILE_MODE6: +case mmGB_MACROTILE_MODE7: +case mmGB_MACROTILE_MODE8: +case mmGB_MACROTILE_MODE9: +case mmGB_MACROTILE_MODE10: +case mmGB_MACROTILE_MODE11: +case mmGB_MACROTILE_MODE12: +case mmGB_MACROTILE_MODE13: +case mmGB_MACROTILE_MODE14: +case mmGB_MACROTILE_MODE15: + idx = (reg_offset - mmGB_MACROTILE_MODE0); +return adev->gfx.config.macrotile_mode_array[idx]; +default : +return RREG32 (reg_offset); } }
@@ -1151,8 +1159,11 @@ static int cik_read_register(struct amdgpu_device *adev, u32 se_num,if (reg_offset != cik_allowed_read_registers[i].reg_offset)continue ; - *value =cik_get_register_value (adev, indexed, se_num, sh_num, - reg_offset); +if (indexed) +return cik_get_register_value_indexed (adev, se_num, sh_num, + reg_offset, value); + + *value =cik_get_register_value (adev, reg_offset);return 0 ; }return -EINVAL ;
Signature · 1 line
2.28.0
PATCH 3/3 drm/amdgpu/vi: fix buffer overflow in vi_get_register_value()
In reply to Dan CarpenterThe values for "se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more than AMDGPU_GFX_MAX_SE (4) or AMDGPU_GFX_MAX_SH_PER_SE (2) then it results in an out of bounds read.
I split this function into to two to make the error handling simpler.
--- drivers/gpu/drm/amd/amdgpu/vi.c | 197 +++++++++++++++++--------------- 1 file changed, 105 insertions(+), 92 deletions(-)
drivers/gpu/drm/amd/amdgpu/vi.c +105 -92
@@ -527,99 +527,108 @@ static const struct amdgpu_allowed_register_entry vi_allowed_read_registers[] {mmPA_SC_RASTER_CONFIG_1, true}, }; -static uint32_t vi_get_register_value (struct amdgpu_device *adev, -bool indexed,u32 se_num, -u32 sh_num,u32 reg_offset) -{ -if (indexed) { -uint32_t val; -unsigned se_idx = (se_num =0xffffffff ) ?0 : se_num; -unsigned sh_idx = (sh_num =0xffffffff ) ?0 : sh_num; - -switch (reg_offset) { -case mmCC_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; -case mmGC_USER_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; -case mmPA_SC_RASTER_CONFIG: -return adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; -case mmPA_SC_RASTER_CONFIG_1: -return adev->gfx.config.rb_config[se_idx][sh_idx].raster_config_1; - } +static int vi_get_register_value_indexed (struct amdgpu_device *adev, +u32 se_num,u32 sh_num, +u32 reg_offset,u32 *value) +{ +unsigned se_idx = (se_num =0xffffffff ) ?0 : se_num; +unsigned sh_idx = (sh_num =0xffffffff ) ?0 : sh_num; -mutex_lock (&adev->grbm_idx_mutex); -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); +if (se_idx >=AMDGPU_GFX_MAX_SE || + sh_idx >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ; - val =RREG32 (reg_offset); +switch (reg_offset) { +case mmCC_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; +return 0 ; +case mmGC_USER_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; +return 0 ; +case mmPA_SC_RASTER_CONFIG: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; +return 0 ; +case mmPA_SC_RASTER_CONFIG_1: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].raster_config_1; +return 0 ; + } -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); -mutex_unlock (&adev->grbm_idx_mutex); -return val; - }else { -unsigned idx; - -switch (reg_offset) { -case mmGB_ADDR_CONFIG: -return adev->gfx.config.gb_addr_config; -case mmMC_ARB_RAMCFG: -return adev->gfx.config.mc_arb_ramcfg; -case mmGB_TILE_MODE0: -case mmGB_TILE_MODE1: -case mmGB_TILE_MODE2: -case mmGB_TILE_MODE3: -case mmGB_TILE_MODE4: -case mmGB_TILE_MODE5: -case mmGB_TILE_MODE6: -case mmGB_TILE_MODE7: -case mmGB_TILE_MODE8: -case mmGB_TILE_MODE9: -case mmGB_TILE_MODE10: -case mmGB_TILE_MODE11: -case mmGB_TILE_MODE12: -case mmGB_TILE_MODE13: -case mmGB_TILE_MODE14: -case mmGB_TILE_MODE15: -case mmGB_TILE_MODE16: -case mmGB_TILE_MODE17: -case mmGB_TILE_MODE18: -case mmGB_TILE_MODE19: -case mmGB_TILE_MODE20: -case mmGB_TILE_MODE21: -case mmGB_TILE_MODE22: -case mmGB_TILE_MODE23: -case mmGB_TILE_MODE24: -case mmGB_TILE_MODE25: -case mmGB_TILE_MODE26: -case mmGB_TILE_MODE27: -case mmGB_TILE_MODE28: -case mmGB_TILE_MODE29: -case mmGB_TILE_MODE30: -case mmGB_TILE_MODE31: - idx = (reg_offset - mmGB_TILE_MODE0); -return adev->gfx.config.tile_mode_array[idx]; -case mmGB_MACROTILE_MODE0: -case mmGB_MACROTILE_MODE1: -case mmGB_MACROTILE_MODE2: -case mmGB_MACROTILE_MODE3: -case mmGB_MACROTILE_MODE4: -case mmGB_MACROTILE_MODE5: -case mmGB_MACROTILE_MODE6: -case mmGB_MACROTILE_MODE7: -case mmGB_MACROTILE_MODE8: -case mmGB_MACROTILE_MODE9: -case mmGB_MACROTILE_MODE10: -case mmGB_MACROTILE_MODE11: -case mmGB_MACROTILE_MODE12: -case mmGB_MACROTILE_MODE13: -case mmGB_MACROTILE_MODE14: -case mmGB_MACROTILE_MODE15: - idx = (reg_offset - mmGB_MACROTILE_MODE0); -return adev->gfx.config.macrotile_mode_array[idx]; -default : -return RREG32 (reg_offset); - } +mutex_lock (&adev->grbm_idx_mutex); +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); + + *value =RREG32 (reg_offset); + +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); +mutex_unlock (&adev->grbm_idx_mutex); +return 0 ; +} + +static uint32_t vi_get_register_value (struct amdgpu_device *adev, +u32 reg_offset) +{ +unsigned idx; + +switch (reg_offset) { +case mmGB_ADDR_CONFIG: +return adev->gfx.config.gb_addr_config; +case mmMC_ARB_RAMCFG: +return adev->gfx.config.mc_arb_ramcfg; +case mmGB_TILE_MODE0: +case mmGB_TILE_MODE1: +case mmGB_TILE_MODE2: +case mmGB_TILE_MODE3: +case mmGB_TILE_MODE4: +case mmGB_TILE_MODE5: +case mmGB_TILE_MODE6: +case mmGB_TILE_MODE7: +case mmGB_TILE_MODE8: +case mmGB_TILE_MODE9: +case mmGB_TILE_MODE10: +case mmGB_TILE_MODE11: +case mmGB_TILE_MODE12: +case mmGB_TILE_MODE13: +case mmGB_TILE_MODE14: +case mmGB_TILE_MODE15: +case mmGB_TILE_MODE16: +case mmGB_TILE_MODE17: +case mmGB_TILE_MODE18: +case mmGB_TILE_MODE19: +case mmGB_TILE_MODE20: +case mmGB_TILE_MODE21: +case mmGB_TILE_MODE22: +case mmGB_TILE_MODE23: +case mmGB_TILE_MODE24: +case mmGB_TILE_MODE25: +case mmGB_TILE_MODE26: +case mmGB_TILE_MODE27: +case mmGB_TILE_MODE28: +case mmGB_TILE_MODE29: +case mmGB_TILE_MODE30: +case mmGB_TILE_MODE31: + idx = (reg_offset - mmGB_TILE_MODE0); +return adev->gfx.config.tile_mode_array[idx]; +case mmGB_MACROTILE_MODE0: +case mmGB_MACROTILE_MODE1: +case mmGB_MACROTILE_MODE2: +case mmGB_MACROTILE_MODE3: +case mmGB_MACROTILE_MODE4: +case mmGB_MACROTILE_MODE5: +case mmGB_MACROTILE_MODE6: +case mmGB_MACROTILE_MODE7: +case mmGB_MACROTILE_MODE8: +case mmGB_MACROTILE_MODE9: +case mmGB_MACROTILE_MODE10: +case mmGB_MACROTILE_MODE11: +case mmGB_MACROTILE_MODE12: +case mmGB_MACROTILE_MODE13: +case mmGB_MACROTILE_MODE14: +case mmGB_MACROTILE_MODE15: + idx = (reg_offset - mmGB_MACROTILE_MODE0); +return adev->gfx.config.macrotile_mode_array[idx]; +default : +return RREG32 (reg_offset); } }
@@ -635,8 +644,12 @@ static int vi_read_register(struct amdgpu_device *adev, u32 se_num,if (reg_offset != vi_allowed_read_registers[i].reg_offset)continue ; - *value =vi_get_register_value (adev, indexed, se_num, sh_num, - reg_offset); +if (indexed) +return vi_get_register_value_indexed (adev, + se_num, sh_num, + reg_offset, value); + + *value =vi_get_register_value (adev, reg_offset);return 0 ; }return -EINVAL ;
Signature · 1 line
2.28.0
Quoted 10 lines · Dan Carpenter
The values for "
se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more thanAMDGPU_GFX_MAX_SE(4) orAMDGPU_GFX_MAX_SH_PER_SE(2) then it results in an out of bounds read.I split this function into to two to make the error handling simpler.
Fixes dd5dfa61b4ff ("drm/amdgpu: refine si_read_register")Signed-off-by Dan Carpenter <[email protected]>
Good catch. This is more defensive, but It's a much simpler check to validate these in the caller. See the attached patch.
Alex
Quoted 187 lines
--- drivers/gpu/drm/amd/amdgpu/si.c | 157 +++++++++++++++++--------------- 1 file changed, 85 insertions(+), 72 deletions(-)drivers/gpu/drm/amd/amdgpu/si.c +85
-73@@ -1051,81 +1051,90 @@ static struct amdgpu_allowed_register_entry si_allowed_read_registers[] = { {PA_SC_RASTER_CONFIG, true}, }; -static uint32_t si_get_register_value (struct amdgpu_device *adev, -bool indexed,u32 se_num, -u32 sh_num,u32 reg_offset) -{ -if (indexed) { -uint32_t val; -unsigned se_idx = (se_num ==0xffffffff ) ?0 : se_num; -unsigned sh_idx = (sh_num ==0xffffffff ) ?0 : sh_num; - -switch (reg_offset) { -case mmCC_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; -case mmGC_USER_RB_BACKEND_DISABLE: -return adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; -case mmPA_SC_RASTER_CONFIG: -return adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; - } +static int si_get_register_value_indexed (struct amdgpu_device *adev, +u32 se_num,u32 sh_num, +u32 reg_offset,u32 *value) +{ +unsigned se_idx = (se_num ==0xffffffff ) ?0 : se_num; +unsigned sh_idx = (sh_num ==0xffffffff ) ?0 : sh_num; -mutex_lock (&adev->grbm_idx_mutex); -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); +if (se_idx >=AMDGPU_GFX_MAX_SE || + sh_idx >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ; - val =RREG32 (reg_offset); +switch (reg_offset) { +case mmCC_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].rb_backend_disable; +return 0 ; +case mmGC_USER_RB_BACKEND_DISABLE: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].user_rb_backend_disable; +return 0 ; +case mmPA_SC_RASTER_CONFIG: + *value = adev->gfx.config.rb_config[se_idx][sh_idx].raster_config; +return 0 ; + } -if (se_num !=0xffffffff || sh_num !=0xffffffff ) -amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); -mutex_unlock (&adev->grbm_idx_mutex); -return val; - }else { -unsigned idx; - -switch (reg_offset) { -case mmGB_ADDR_CONFIG: -return adev->gfx.config.gb_addr_config; -case mmMC_ARB_RAMCFG: -return adev->gfx.config.mc_arb_ramcfg; -case mmGB_TILE_MODE0: -case mmGB_TILE_MODE1: -case mmGB_TILE_MODE2: -case mmGB_TILE_MODE3: -case mmGB_TILE_MODE4: -case mmGB_TILE_MODE5: -case mmGB_TILE_MODE6: -case mmGB_TILE_MODE7: -case mmGB_TILE_MODE8: -case mmGB_TILE_MODE9: -case mmGB_TILE_MODE10: -case mmGB_TILE_MODE11: -case mmGB_TILE_MODE12: -case mmGB_TILE_MODE13: -case mmGB_TILE_MODE14: -case mmGB_TILE_MODE15: -case mmGB_TILE_MODE16: -case mmGB_TILE_MODE17: -case mmGB_TILE_MODE18: -case mmGB_TILE_MODE19: -case mmGB_TILE_MODE20: -case mmGB_TILE_MODE21: -case mmGB_TILE_MODE22: -case mmGB_TILE_MODE23: -case mmGB_TILE_MODE24: -case mmGB_TILE_MODE25: -case mmGB_TILE_MODE26: -case mmGB_TILE_MODE27: -case mmGB_TILE_MODE28: -case mmGB_TILE_MODE29: -case mmGB_TILE_MODE30: -case mmGB_TILE_MODE31: - idx = (reg_offset - mmGB_TILE_MODE0); -return adev->gfx.config.tile_mode_array[idx]; -default : -return RREG32 (reg_offset); - } +mutex_lock (&adev->grbm_idx_mutex); +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev, se_num, sh_num,0xffffffff ); + + *value =RREG32 (reg_offset); + +if (se_num !=0xffffffff || sh_num !=0xffffffff ) +amdgpu_gfx_select_se_sh (adev,0xffffffff ,0xffffffff ,0xffffffff ); +mutex_unlock (&adev->grbm_idx_mutex); +return 0 ; +} + +static uint32_t si_get_register_value (struct amdgpu_device *adev, +u32 reg_offset) +{ +unsigned idx; + +switch (reg_offset) { +case mmGB_ADDR_CONFIG: +return adev->gfx.config.gb_addr_config; +case mmMC_ARB_RAMCFG: +return adev->gfx.config.mc_arb_ramcfg; +case mmGB_TILE_MODE0: +case mmGB_TILE_MODE1: +case mmGB_TILE_MODE2: +case mmGB_TILE_MODE3: +case mmGB_TILE_MODE4: +case mmGB_TILE_MODE5: +case mmGB_TILE_MODE6: +case mmGB_TILE_MODE7: +case mmGB_TILE_MODE8: +case mmGB_TILE_MODE9: +case mmGB_TILE_MODE10: +case mmGB_TILE_MODE11: +case mmGB_TILE_MODE12: +case mmGB_TILE_MODE13: +case mmGB_TILE_MODE14: +case mmGB_TILE_MODE15: +case mmGB_TILE_MODE16: +case mmGB_TILE_MODE17: +case mmGB_TILE_MODE18: +case mmGB_TILE_MODE19: +case mmGB_TILE_MODE20: +case mmGB_TILE_MODE21: +case mmGB_TILE_MODE22: +case mmGB_TILE_MODE23: +case mmGB_TILE_MODE24: +case mmGB_TILE_MODE25: +case mmGB_TILE_MODE26: +case mmGB_TILE_MODE27: +case mmGB_TILE_MODE28: +case mmGB_TILE_MODE29: +case mmGB_TILE_MODE30: +case mmGB_TILE_MODE31: + idx = (reg_offset - mmGB_TILE_MODE0); +return adev->gfx.config.tile_mode_array[idx]; +default : +return RREG32 (reg_offset); } } +static int si_read_register (struct amdgpu_device *adev,u32 se_num,u32 sh_num,u32 reg_offset,u32 *value) {@@ -1138,8 +1147,12 @@ static int si_read_register(struct amdgpu_device *adev, u32 se_num,if (reg_offset != si_allowed_read_registers[i].reg_offset)continue ; - *value =si_get_register_value (adev, indexed, se_num, sh_num, - reg_offset); +if (indexed) +return si_get_register_value_indexed (adev, + se_num, sh_num, + reg_offset, value); + + *value =si_get_register_value (adev, reg_offset);return 0 ; }return -EINVAL ; --2.28.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
From 2d6c1abaeab54561452b14c5d702f51235ae5a70 Mon Sep 17 00:00:00 2001
From: Alex Deucher <[email protected]>
Date: Tue, 25 Aug 2020 11:43:45 -0400
Subject: [PATCH] drm/amdgpu: Fix buffer overflow in INFO ioctl
The values for "se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more than AMDGPU_GFX_MAX_SE (4) or AMDGPU_GFX_MAX_SH_PER_SE (2) then it results in an out of bounds read.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +4 -0
@@ -669,8 +669,12 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file* in the bitfields */ if (se_num ==AMDGPU_INFO_MMR_SE_INDEX_MASK ) se_num =0xffffffff ; +else if (se_num >=AMDGPU_GFX_MAX_SE ) +return -EINVAL ;if (sh_num ==AMDGPU_INFO_MMR_SH_INDEX_MASK ) sh_num =0xffffffff ; +else if (sh_num >=AMDGPU_GFX_MAX_SH_PER_SE ) +return -EINVAL ;if (info->read_mmr_reg.count >128 )return -EINVAL ;
Signature · 1 line
2.25.4
Dan Carpenter
Acked-byQuoted 7 lines · Alex Deucher
Quoted 6 lines · Dan Carpenter
The values for "
se_num" and "sh_num" come from the user in the ioctl. They can be in the 0-255 range but if they're more thanAMDGPU_GFX_MAX_SE(4) orAMDGPU_GFX_MAX_SH_PER_SE(2) then it results in an out of bounds read.
Quoted 8 lines
Quoted 4 lines
I split this function into to two to make the error handling simpler.
Fixes dd5dfa61b4ff ("drm/amdgpu: refine si_read_register")Signed-off-by Dan Carpenter <[email protected]>Good catch. This is more defensive, but It's a much simpler check to validate these in the caller. See the attached patch.
That works too.
regards,
dan carpenter