drm/{amdgpu, radeon}: check PS, WS index
PATCH 1/1 drm/{amdgpu, radeon}: check PS, WS index
These patches add index checking to parameter / work space reads and writes to ATOMBIOS bytecode. Theoretically, it would be possible to perform stack-aligned out-of-bounds read and writes, and since the bytecode is in the BIOS, any exploits which could be made with this would persist across reboots.
This is my first patch to the Linux kernel; I did my best to follow the style guidelines, I hope I didn't make too many mistakes!
Tested on a R5 340X; sadly do not have any more modern GPUs to test this with.
PATCH 1/2 drm/amdgpu: check PS, WS index
From: Alexander Richards <[email protected]>
Theoretically, it would be possible for a buggy or malicious VBIOS to overwrite past the bounds of the passed parameters (or its own workspace); add bounds checking to prevent this from happening.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 24 +++++++---- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 3 +- drivers/gpu/drm/amd/amdgpu/atom.c | 41 +++++++++++++----- drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 +- .../gpu/drm/amd/amdgpu/atombios_encoders.c | 16 +++---- drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 4 +- .../drm/amd/display/dc/bios/command_table.c | 2 +- .../drm/amd/display/dc/bios/command_table2.c | 2 +- .../drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 42 +++++++++---------- .../drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 4 +- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- .../gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 2 +- 14 files changed, 102 insertions(+), 74 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +16 -8
@@ -1018,7 +1018,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,if (clock_type ==COMPUTE_ENGINE_PLL_PARAM ) { args.v3.ulClockParams =cpu_to_le32 ((clock_type <<24 ) | clock); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); dividers->post_div = args.v3.ucPostDiv; dividers->enable_post_div = (args.v3.ucCntlFlag &
@@ -1038,7 +1039,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,if (strobe_mode) args.v5.ucInputFlag =ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); dividers->post_div = args.v5.ucPostDiv; dividers->enable_post_div = (args.v5.ucCntlFlag &
@@ -1056,7 +1058,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,/* fusion */ args.v4.ulClock =cpu_to_le32 (clock);/* 10 khz */ -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); dividers->post_divider = dividers->post_div = args.v4.ucPostDiv; dividers->real_clock =le32_to_cpu (args.v4.ulClock);
@@ -1067,7 +1070,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev, args.v6_in.ulClock.ulComputeClockFlag = clock_type; args.v6_in.ulClock.ulClockFreq =cpu_to_le32 (clock);/* 10 khz */ -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); dividers->whole_fb_div =le16_to_cpu (args.v6_out.ulFbDiv.usFbDiv); dividers->frac_fb_div =le16_to_cpu (args.v6_out.ulFbDiv.usFbDivFrac);
@@ -1109,7 +1113,8 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev,if (strobe_mode) args.ucInputFlag |=MPLL_INPUT_FLAG_STROBE_MODE_EN ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); mpll_param->clkfrac =le16_to_cpu (args.ulFbDiv.usFbDivFrac); mpll_param->clkf =le16_to_cpu (args.ulFbDiv.usFbDiv);
@@ -1151,7 +1156,8 @@ void amdgpu_atombios_set_engine_dram_timings(struct amdgpu_device *adev,if (mem_clock) args.sReserved.ulClock =cpu_to_le32 (mem_clock &SET_CLOCK_FREQ_MASK ); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); } void amdgpu_atombios_get_default_voltages(struct amdgpu_device *adev,
@@ -1205,7 +1211,8 @@ int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type, args.v2.ucVoltageMode =0 ; args.v2.usVoltageLevel =0 ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); *voltage =le16_to_cpu (args.v2.usVoltageLevel);break ;
@@ -1214,7 +1221,8 @@ int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type, args.v3.ucVoltageMode =ATOM_GET_VOLTAGE_LEVEL ; args.v3.usVoltageLevel =cpu_to_le16 (voltage_id); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args)); *voltage =le16_to_cpu (args.v3.usVoltageLevel);break ;
drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +2 -1
@@ -941,5 +941,6 @@ int amdgpu_atomfirmware_asic_init(struct amdgpu_device *adev, bool fb_reset)return -EINVAL ; } -return amdgpu_atom_execute_table (ctx,ATOM_CMD_INIT , (uint32_t *)&asic_init_ps_v2_1); +return amdgpu_atom_execute_table (ctx,ATOM_CMD_INIT , (uint32_t *)&asic_init_ps_v2_1, +sizeof (asic_init_ps_v2_1)); }
drivers/gpu/drm/amd/amdgpu/atom.c +30 -11
117 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/atom.h +1 -1
@@ -156,7 +156,7 @@ struct atom_context {extern int amdgpu_atom_debug;struct atom_context *amdgpu_atom_parse (struct card_info *card,void *bios); -int amdgpu_atom_execute_table (struct atom_context *ctx,int index,uint32_t *params); +int amdgpu_atom_execute_table (struct atom_context *ctx,int index,uint32_t *params,int params_size);int amdgpu_atom_asic_init (struct atom_context *ctx);void amdgpu_atom_destroy (struct atom_context *ctx); bool amdgpu_atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size,
drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +14 -14
@@ -77,7 +77,7 @@ void amdgpu_atombios_crtc_overscan_setup(struct drm_crtc *crtc, args.usOverscanTop =cpu_to_le16 (amdgpu_crtc->v_border);break ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_scaler_setup (struct drm_crtc *crtc)
@@ -106,7 +106,7 @@ void amdgpu_atombios_crtc_scaler_setup(struct drm_crtc *crtc) args.ucEnable =ATOM_SCALER_DISABLE ;break ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_lock (struct drm_crtc *crtc,int lock)
@@ -123,7 +123,7 @@ void amdgpu_atombios_crtc_lock(struct drm_crtc *crtc, int lock) args.ucCRTC = amdgpu_crtc->crtc_id; args.ucEnable = lock; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_enable (struct drm_crtc *crtc,int state)
@@ -139,7 +139,7 @@ void amdgpu_atombios_crtc_enable(struct drm_crtc *crtc, int state) args.ucCRTC = amdgpu_crtc->crtc_id; args.ucEnable = state; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_blank (struct drm_crtc *crtc,int state)
@@ -155,7 +155,7 @@ void amdgpu_atombios_crtc_blank(struct drm_crtc *crtc, int state) args.ucCRTC = amdgpu_crtc->crtc_id; args.ucBlanking = state; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_powergate (struct drm_crtc *crtc,int state)
@@ -171,7 +171,7 @@ void amdgpu_atombios_crtc_powergate(struct drm_crtc *crtc, int state) args.ucDispPipeId = amdgpu_crtc->crtc_id; args.ucEnable = state; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_powergate_init (struct amdgpu_device *adev)
@@ -183,7 +183,7 @@ void amdgpu_atombios_crtc_powergate_init(struct amdgpu_device *adev) args.ucEnable =ATOM_INIT ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_set_dtd_timing(struct drm_crtc *crtc,
@@ -228,7 +228,7 @@ void amdgpu_atombios_crtc_set_dtd_timing(struct drm_crtc *crtc, args.susModeMiscInfo.usAccess =cpu_to_le16 (misc); args.ucCRTC = amdgpu_crtc->crtc_id; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }union atom_enable_ss {
@@ -293,7 +293,7 @@ static void amdgpu_atombios_crtc_program_ss(struct amdgpu_device *adev, args.v3.usSpreadSpectrumStep =cpu_to_le16 (ss->step); args.v3.ucEnable = enable; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }union adjust_pixel_clock {
@@ -395,7 +395,7 @@ static u32 amdgpu_atombios_crtc_adjust_pll(struct drm_crtc *crtc,ADJUST_DISPLAY_CONFIG_SS_ENABLE ;amdgpu_atom_execute_table (adev->mode_info.atom_context, - index, (uint32_t *)&args); + index, (uint32_t *)&args,sizeof (args)); adjusted_clock =le16_to_cpu (args.v1.usPixelClock) *10 ;break ;case 3 :
@@ -428,7 +428,7 @@ static u32 amdgpu_atombios_crtc_adjust_pll(struct drm_crtc *crtc, args.v3.sInput.ucExtTransmitterID =0 ;amdgpu_atom_execute_table (adev->mode_info.atom_context, - index, (uint32_t *)&args); + index, (uint32_t *)&args,sizeof (args)); adjusted_clock =le32_to_cpu (args.v3.sOutput.ulDispPllFreq) *10 ;if (args.v3.sOutput.ucRefDiv) { amdgpu_crtc->pll_flags |=AMDGPU_PLL_USE_FRAC_FB_DIV ;
@@ -514,7 +514,7 @@ void amdgpu_atombios_crtc_set_disp_eng_pll(struct amdgpu_device *adev,DRM_ERROR ("Unknown table version %d %d\n" , frev, crev);return ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }union set_dce_clock {
@@ -544,7 +544,7 @@ u32 amdgpu_atombios_crtc_set_dce_clock(struct amdgpu_device *adev, args.v2_1.asParam.ulDCEClkFreq =cpu_to_le32 (freq);/* 10kHz units */ args.v2_1.asParam.ucDCEClkType = clk_type; args.v2_1.asParam.ucDCEClkSrc = clk_src; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); ret_freq =le32_to_cpu (args.v2_1.asParam.ulDCEClkFreq) *10 ;break ;default :
@@ -740,7 +740,7 @@ void amdgpu_atombios_crtc_program_pll(struct drm_crtc *crtc,return ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } int amdgpu_atombios_crtc_prepare_pll(struct drm_crtc *crtc,
drivers/gpu/drm/amd/amdgpu/atombios_dp.c +2 -2
@@ -83,7 +83,7 @@ static int amdgpu_atombios_dp_process_aux_ch(struct amdgpu_i2c_chan *chan, args.v2.ucDelay = delay /10 ; args.v2.ucHPD_ID = chan->rec.hpd; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); *ack = args.v2.ucReplyStatus;
@@ -301,7 +301,7 @@ static u8 amdgpu_atombios_dp_encoder_service(struct amdgpu_device *adev, args.ucLaneNum = lane_num; args.ucStatus =0 ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));return args.ucStatus; }
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +8 -8
@@ -334,7 +334,7 @@ amdgpu_atombios_encoder_setup_dac(struct drm_encoder *encoder, int action) args.ucDacStandard =ATOM_DAC1_PS2 ; args.usPixelClock =cpu_to_le16 (amdgpu_encoder->pixel_clock /10 ); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }
@@ -431,7 +431,7 @@ amdgpu_atombios_encoder_setup_dvo(struct drm_encoder *encoder, int action)break ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }int amdgpu_atombios_encoder_get_encoder_mode (struct drm_encoder *encoder)
@@ -731,7 +731,7 @@ amdgpu_atombios_encoder_setup_dig_encoder(struct drm_encoder *encoder,break ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }
@@ -1135,7 +1135,7 @@ amdgpu_atombios_encoder_setup_dig_transmitter(struct drm_encoder *encoder, int abreak ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }bool
@@ -1163,7 +1163,7 @@ amdgpu_atombios_encoder_set_edp_panel_power(struct drm_connector *connector, args.v1.ucAction = action; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));/* wait for the panel to power up */ if (action ==ATOM_TRANSMITTER_ACTION_POWER_ON ) {
@@ -1287,7 +1287,7 @@ amdgpu_atombios_encoder_setup_external_encoder(struct drm_encoder *encoder,DRM_ERROR ("Unknown table version: %d, %d\n" , frev, crev);return ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } static void
@@ -1632,7 +1632,7 @@ amdgpu_atombios_encoder_set_crtc_source(struct drm_encoder *encoder)return ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }/* This only needs to be called once at startup */
@@ -1705,7 +1705,7 @@ amdgpu_atombios_encoder_dac_load_detect(struct drm_encoder *encoder, args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));return true; }else
drivers/gpu/drm/amd/amdgpu/atombios_i2c.c +2 -2
@@ -86,7 +86,7 @@ static int amdgpu_atombios_i2c_process_i2c_ch(struct amdgpu_i2c_chan *chan, args.ucSlaveAddr = slave_addr <<1 ; args.ucLineNumber = chan->rec.i2c_id; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));/* error */ if (args.ucStatus !=HW_ASSISTED_I2C_STATUS_SUCCESS ) {
@@ -172,5 +172,5 @@ void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device *adev, u8 slave_addr args.ucSlaveAddr = slave_addr; args.ucLineNumber = line_number; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }
drivers/gpu/drm/amd/display/dc/bios/command_table.c +1 -1
@@ -37,7 +37,7 @@#define EXEC_BIOS_CMD_TABLE (command, params)\ (amdgpu_atom_execute_table(((struct amdgpu_device *)bp->base.ctx->driver_context)->mode_info.atom_context, \ GetIndexIntoMasterTable(COMMAND, command), \ - (uint32_t *)¶ms) == 0) + (uint32_t *)¶ms, sizeof(params)) == 0)#define BIOS_CMD_TABLE_REVISION (command, frev, crev)\ amdgpu_atom_parse_cmd_header(((struct amdgpu_device *)bp->base.ctx->driver_context)->mode_info.atom_context, \
drivers/gpu/drm/amd/display/dc/bios/command_table2.c +1 -1
@@ -49,7 +49,7 @@#define EXEC_BIOS_CMD_TABLE (fname, params)\ (amdgpu_atom_execute_table(((struct amdgpu_device *)bp->base.ctx->driver_context)->mode_info.atom_context, \ GET_INDEX_INTO_MASTER_TABLE(command, fname), \ - (uint32_t *)¶ms) == 0) + (uint32_t *)¶ms, sizeof(params)) == 0)#define BIOS_CMD_TABLE_REVISION (fname, frev, crev)\ amdgpu_atom_parse_cmd_header(((struct amdgpu_device *)bp->base.ctx->driver_context)->mode_info.atom_context, \
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +21 -21
168 lines not on this page · raw message
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c +2 -2
@@ -258,7 +258,7 @@ int pp_atomfwctrl_get_gpu_pll_dividers_vega10(struct pp_hwmgr *hwmgr, idx =GetIndexIntoMasterCmdTable (computegpuclockparam);if (amdgpu_atom_execute_table ( - adev->mode_info.atom_context, idx, (uint32_t *)&pll_parameters)) + adev->mode_info.atom_context, idx, (uint32_t *)&pll_parameters,sizeof (pll_parameters)))return -EINVAL ; pll_output = (struct compute_gpu_clock_output_parameter_v1_8 *)
@@ -505,7 +505,7 @@ int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, ix =GetIndexIntoMasterCmdTable (getsmuclockinfo);if (amdgpu_atom_execute_table ( - adev->mode_info.atom_context, ix, (uint32_t *)¶meters)) + adev->mode_info.atom_context, ix, (uint32_t *)¶meters,sizeof (parameters)))return -EINVAL ; output = (struct atom_get_smu_clock_info_output_parameters_v3_1 *)¶meters;
drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1 -1
@@ -514,7 +514,7 @@ static int smu_v11_0_atom_get_smu_clockinfo(struct amdgpu_device *adev, getsmuclockinfo); ret =amdgpu_atom_execute_table (adev->mode_info.atom_context, index, - (uint32_t *)&input); + (uint32_t *)&input,sizeof (input));if (ret)return -EINVAL ;
drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c +1 -1
@@ -301,7 +301,7 @@ static int smu_v12_0_atom_get_smu_clockinfo(struct amdgpu_device *adev, getsmuclockinfo); ret =amdgpu_atom_execute_table (adev->mode_info.atom_context, index, - (uint32_t *)&input); + (uint32_t *)&input,sizeof (input));if (ret)return -EINVAL ;
Signature · 1 line
2.43.0
RE: [PATCH 1/2] drm/amdgpu: check PS, WS index
[Public]
Quoted 8 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Alexander
Sent: Thursday, January 11, 2024 10:05 AM
To: [email protected]
Cc: Alexander Richards <[email protected]>
Subject: [PATCH 1/2] drm/amdgpu: check PS, WS index
Quoted 7 lines
From: Alexander Richards <[email protected]>
Theoretically, it would be possible for a buggy or malicious VBIOS to overwrite past the bounds of the passed parameters (or its own workspace); add bounds checking to prevent this from happening.
Signed-off-by Alexander Richards <[email protected]>
Applied the series. Thanks!
Quoted 1,025 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 24 +++++++---- .../gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 3 +- drivers/gpu/drm/amd/amdgpu/atom.c | 41 +++++++++++++----- drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 28 ++++++------- drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 4 +- .../gpu/drm/amd/amdgpu/atombios_encoders.c | 16 +++---- drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 4 +- .../drm/amd/display/dc/bios/command_table.c | 2 +- .../drm/amd/display/dc/bios/command_table2.c | 2 +- .../drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 42 +++++++++---------- .../drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c | 4 +- .../gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 +- .../gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 2 +- 14 files changed, 102 insertions(+), 74 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +1
-1@@ -1018,7 +1018,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev, if (clock_type == COMPUTE_ENGINE_PLL_PARAM) { args.v3.ulClockParams =cpu_to_le32 ((clock_type <<24 ) | clock); -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); + amdgpu_atom_execute_table(adev-Quoted 1 line
mode_info.atom_context, index, (
uint32_t*)&args,drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +2
-1+ sizeof(args)); dividers->post_div = args.v3.ucPostDiv; dividers->enable_post_div = (args.v3.ucCntlFlag &@@ -1038,7 +1039,8 @@ int amdgpu_atombios_get_clock_dividers(structamdgpu_device *adev, if (strobe_mode) args.v5.ucInputFlag =ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN ; -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); + amdgpu_atom_execute_table(adev-Quoted 1 line
mode_info.atom_context, index, (
uint32_t*)&args,drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +3
-1+ sizeof(args)); dividers->post_div = args.v5.ucPostDiv; dividers->enable_post_div = (args.v5.ucCntlFlag &@@ -1056,7 +1058,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev,/* fusion */ args.v4.ulClock =cpu_to_le32 (clock);/* 10 khz */ -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args));dividers->post_divider = dividers->post_div = args.v4.ucPostDiv; dividers->real_clock = le32_to_cpu(args.v4.ulClock); @@ - 1067,7 +1070,8 @@ int amdgpu_atombios_get_clock_dividers(struct amdgpu_device *adev, args.v6_in.ulClock.ulComputeClockFlag = clock_type; args.v6_in.ulClock.ulClockFreq = cpu_to_le32(clock); /* 10khz */
- amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context, index, (
uint32_t*)&args);+ amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context, index, (
uint32_t*)&args,+ sizeof(args));
dividers->whole_fb_div = le16_to_cpu(args.v6_out.ulFbDiv.usFbDiv); dividers->frac_fb_div =
le16_to_cpu(args.v6_out.ulFbDiv.usFbDivFrac);drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +1
-1@@ -1109,7 +1113,8 @@ int amdgpu_atombios_get_memory_pll_dividers(struct amdgpu_device *adev, if (strobe_mode) args.ucInputFlag |= MPLL_INPUT_FLAG_STROBE_MODE_EN; -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); + amdgpu_atom_execute_table(adev-Quoted 1 line
mode_info.atom_context, index, (
uint32_t*)&args,+ sizeof(args));
mpll_param->clkfrac = le16_to_cpu(args.ulFbDiv.usFbDivFrac); mpll_param->clkf =
le16_to_cpu(args.ulFbDiv.usFbDiv);drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +1
-1@@ -1151,7 +1156,8 @@ void amdgpu_atombios_set_engine_dram_timings(struct amdgpu_device *adev, if (mem_clock) args.sReserved.ulClock = cpu_to_le32(mem_clock &SET_CLOCK_FREQ_MASK ); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); + amdgpu_atom_execute_table(adev->mode_info.atom_context, index,(
uint32_t*)&args,drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +3
-1+ sizeof(args)); } void amdgpu_atombios_get_default_voltages(struct amdgpu_device *adev,@@ -1205,7 +1211,8 @@ int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type, args.v2.ucVoltageMode = 0; args.v2.usVoltageLevel =0 ; -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args));*voltage = le16_to_cpu(args.v2.usVoltageLevel); break;drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c +2
-1@@ -1214,7 +1221,8 @@ int amdgpu_atombios_get_max_vddc(struct amdgpu_device *adev, u8 voltage_type, args.v3.ucVoltageMode = ATOM_GET_VOLTAGE_LEVEL; args.v3.usVoltageLevel =cpu_to_le16 (voltage_id); -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args, +sizeof (args));*voltage = le16_to_cpu(args.v3.usVoltageLevel); break;drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +0
-1@@ -941,5 +941,6 @@ int amdgpu_atomfirmware_asic_init(struct amdgpu_device *adev, bool fb_reset) return -EINVAL; } - return amdgpu_atom_execute_table(ctx, ATOM_CMD_INIT, (uint32_t*)&asic_init_ps_v2_1);
+ return amdgpu_atom_execute_table(ctx,ATOM_CMD_INIT, (uint32_t
*)&asic_init_ps_v2_1,drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +1
-0+ sizeof(asic_init_ps_v2_1)); }drivers/gpu/drm/amd/amdgpu/atom.c +1
-1@@ -62,6 +62,7 @@ typedef struct { struct atom_context *ctx; uint32_t *ps, *ws; + int ps_size, ws_size; int ps_shift; uint16_t start; unsigned last_jump;@@ -70,8 +71,8 @@ typedef struct { } atom_exec_context;int amdgpu_atom_debug; -static int amdgpu_atom_execute_table_locked(struct atom_context *ctx, intindex,
uint32_t*params); -intamdgpu_atom_execute_table(struct atom_context *ctx, int index, uint32_t *params);drivers/gpu/drm/amd/amdgpu/atom.c +4
-0+static int amdgpu_atom_execute_table_locked (struct atom_context *ctx, +int index,uint32_t *params,int params_size);int +amdgpu_atom_execute_table (struct atom_context *ctx,int index,uint32_t +*params,int params_size);static uint32_t atom_arg_mask[8 ] = {0xFFFFFFFF ,0xFFFF ,0xFFFF00 ,0xFFFF0000 ,0xFF ,0xFF00 ,
0xFF0000, @@ -223,7 +224,10 @@ staticuint32_tatom_get_src_int(atom_exec_context *ctx,uint8_tattr,(*ptr)++; /* get_unaligned_le32 avoids unaligned accesses fromatombios
* tables, noticed on a DEC Alpha. */drivers/gpu/drm/amd/amdgpu/atom.c +4
-1- val =get_unaligned_le32 ((u32 *)&ctx->ps[idx]); +if (idx < ctx->ps_size) + val =get_unaligned_le32 ((u32 *)&ctx->ps[idx]); +else + pr_info("PS index out of range: %i > %i\n", idx, ctx-Quoted 1 line
ps_size);if (print) DEBUG("PS[0x%02X,0x%04X]", idx, val); break;drivers/gpu/drm/amd/amdgpu/atom.c +4
-1@@ -261,7 +265,10 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr, val = gctx->reg_block;break ;default : - val = ctx->ws[idx]; +if (idx < ctx->ws_size) + val = ctx->ws[idx]; +else +pr_info ("WS index out of range: %i > %i\n" , idx, ctx->ws_size); }break; case ATOM_ARG_ID:drivers/gpu/drm/amd/amdgpu/atom.c +4
-0@@ -496,6 +503,10 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr, idx =U8 (*ptr); (*ptr)++;DEBUG ("PS[0x%02X]" , idx); +if (idx >= ctx->ps_size) { +pr_info ("PS index out of range: %i > %i\n" , idx, ctx- >ps_size); +return ; + } ctx->ps[idx] =cpu_to_le32 (val);break; case ATOM_ARG_WS:drivers/gpu/drm/amd/amdgpu/atom.c +4
-0@@ -528,6 +539,10 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr, gctx->reg_block = val;break ;default : +if (idx >= ctx->ws_size) { +pr_info ("WS index out of range: %i > %i\n" , idx, ctx->ws_size); +return ; + } ctx->ws[idx] = val;} break;drivers/gpu/drm/amd/amdgpu/atom.c +12
-4@@ -625,7 +640,7 @@ static void atom_op_calltable(atom_exec_context *ctx, int *ptr, int arg) elseSDEBUG (" table: %d\n" , idx);if (U16 (ctx->ctx->cmd_table +4 +2 * idx)) - r = amdgpu_atom_execute_table_locked(ctx->ctx, idx, ctx->ps + ctx->ps_shift); + r =amdgpu_atom_execute_table_locked (ctx->ctx, idx, ctx->ps + +ctx->ps_shift, ctx->ps_size - ctx->ps_shift);if (r) { ctx->abort = true; }@@ -1204,7 +1219,7 @@ static struct { atom_op_div32, ATOM_ARG_WS}, }; -static int amdgpu_atom_execute_table_locked (struct atom_context *ctx,int index, uint32_t *params) +static int amdgpu_atom_execute_table_locked (struct atom_context *ctx, +int index,uint32_t *params,int params_size) {int base =CU16 (ctx->cmd_table +4 +2 * index);int len, ws, ps, ptr;@@ -1226,12 +1241,16 @@ static int amdgpu_atom_execute_table_locked(struct atom_context *ctx, int index, ectx.ps_shift = ps / 4; ectx.start = base; ectx.ps = params; + ectx.ps_size = params_size; ectx.abort = false; ectx.last_jump =0 ; -if (ws) +if (ws) { ectx.ws =kcalloc (4 , ws,GFP_KERNEL ); -else + ectx.ws_size = ws; + }else { ectx.ws =NULL ; + ectx.ws_size =0 ; + } debug_depth++;while (1) {drivers/gpu/drm/amd/amdgpu/atom.c +2
-1@@ -1265,7 +1284,7 @@ static int amdgpu_atom_execute_table_locked(struct atom_context *ctx, int index, return ret; } -int amdgpu_atom_execute_table (struct atom_context *ctx,int index, uint32_t *params) +int amdgpu_atom_execute_table (struct atom_context *ctx,int index, +uint32_t *params,int params_size) {int r;@@ -1281,7 +1300,7 @@ int amdgpu_atom_execute_table(struct
atom_context*ctx, int index,uint32_t*par/* reset divmul */ ctx->divmul[0] = 0; ctx->divmul[1] = 0;drivers/gpu/drm/amd/amdgpu/atom.c +1
-1- r =amdgpu_atom_execute_table_locked (ctx, index, params); + r = amdgpu_atom_execute_table_locked(ctx, index, params,params_size); mutex_unlock(&ctx->mutex); return r;}
drivers/gpu/drm/amd/amdgpu/atom.c +1
-1@@ -1553,7 +1572,7 @@ int amdgpu_atom_asic_init(struct atom_context *ctx)if (!CU16 (ctx->cmd_table +4 +2 *ATOM_CMD_INIT ))return 1 ; - ret =amdgpu_atom_execute_table (ctx,ATOM_CMD_INIT , ps); + ret =amdgpu_atom_execute_table (ctx,ATOM_CMD_INIT , ps,16 );if (ret)return ret;drivers/gpu/drm/amd/amdgpu/atom.h +2
-0@@ -156,7 +156,7 @@ struct atom_context { extern int amdgpu_atom_debug;struct atom_context *amdgpu_atom_parse (struct card_info *card,void *bios); -int amdgpu_atom_execute_table(struct atom_context *ctx, int index, uint32_t *params); +int amdgpu_atom_execute_table (struct atom_context *ctx,int index, +uint32_t *params,int params_size);int amdgpu_atom_asic_init (struct atom_context *ctx);void
amdgpu_atom_destroy(struct atom_context *ctx); bool amdgpu_atom_parse_data_header(structatom_context*ctx, int index,uint16_t*size, diff --gita/drivers/gpu/drm/amd/amdgpu/atombios_crtc.cb/drivers/gpu/drm/amd/amdgpu/atombios_crtc.c
index10098fdd3..3dfc28840100644drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +3
-2@@ -77,7 +77,7 @@ void amdgpu_atombios_crtc_overscan_setup(struct drm_crtc *crtc, args.usOverscanTop =cpu_to_le16 (amdgpu_crtc->v_border);break ; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_scaler_setup(struct drm_crtc *crtc) @@ -106,7 +106,7 @@ void amdgpu_atombios_crtc_scaler_setup(struct drm_crtc *crtc) args.ucEnable = ATOM_SCALER_DISABLE;break ; } - amdgpu_atom_execute_table(adev->mode_info.atom_context, index,(
uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +3
-1+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_lock(struct drm_crtc *crtc, int lock) @@ -123,7 +123,7 @@ void amdgpu_atombios_crtc_lock(struct drm_crtc *crtc, int lock) args.ucCRTC = amdgpu_crtc->crtc_id; args.ucEnable = lock; - amdgpu_atom_execute_table(adev->mode_info.atom_context, index,(
uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +2
-0+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_enable(struct drm_crtc *crtc, int state) @@ -139,7 +139,7 @@ void
amdgpu_atombios_crtc_enable(struct drm_crtc *crtc, int state)args.ucCRTC = amdgpu_crtc->crtc_id; args.ucEnable = state;- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +2
-0+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_blank(struct drm_crtc *crtc, int state) @@ -155,7 +155,7 @@ void
amdgpu_atombios_crtc_blank(struct drm_crtc *crtc, int state)args.ucCRTC = amdgpu_crtc->crtc_id; args.ucBlanking = state;- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +2
-1+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_powergate(struct drm_crtc *crtc, int state) @@ -171,7 +171,7 @@ void amdgpu_atombios_crtc_powergate(struct drm_crtc*crtc, int state)
args.ucDispPipeId = amdgpu_crtc->crtc_id; args.ucEnable = state;- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +4
-1+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }void amdgpu_atombios_crtc_powergate_init (struct amdgpu_device *adev)@@ -183,7 +183,7 @@ void amdgpu_atombios_crtc_powergate_init(struct amdgpu_device *adev) args.ucEnable = ATOM_INIT; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } void amdgpu_atombios_crtc_set_dtd_timing(struct drm_crtc *crtc, @@ -228,7 +228,7 @@ void amdgpu_atombios_crtc_set_dtd_timing(struct
drm_crtc*crtc,args.susModeMiscInfo.usAccess = cpu_to_le16(misc); args.ucCRTC = amdgpu_crtc->crtc_id;- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +5
-2+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }union atom_enable_ss {@@ -293,7 +293,7 @@ static void amdgpu_atombios_crtc_program_ss(struct amdgpu_device *adev, args.v3.usSpreadSpectrumStep = cpu_to_le16(ss->step); args.v3.ucEnable = enable; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }union adjust_pixel_clock {@@ -395,7 +395,7 @@ static u32 amdgpu_atombios_crtc_adjust_pll(structdrm_crtc *crtc,ADJUST_DISPLAY_CONFIG_SS_ENABLE ; amdgpu_atom_execute_table(adev- >mode_info.atom_context, - index, (uint32_t *)&args); + index, (uint32_t *)&args,sizeof(args));
adjusted_clock=le16_to_cpu(args.v1.usPixelClock)*10; break; case 3:drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +1
-1@@ -428,7 +428,7 @@ static u32 amdgpu_atombios_crtc_adjust_pll(struct drm_crtc *crtc, args.v3.sInput.ucExtTransmitterID =0 ;amdgpu_atom_execute_table (adev- >mode_info.atom_context, - index, (uint32_t *)&args); + index, (uint32_t *)&args,sizeof (args));
adjusted_clock=le32_to_cpu(args.v3.sOutput.ulDispPllFreq) * 10; if (args.v3.sOutput.ucRefDiv) { amdgpu_crtc->pll_flags |= AMDGPU_PLL_USE_FRAC_FB_DIV; @@ -514,7 +514,7 @@ void amdgpu_atombios_crtc_set_disp_eng_pll(struct amdgpu_device *adev, DRM_ERROR("Unknown table version %d %d\n", frev, crev); return; }- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +3
-1+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }union set_dce_clock {@@ -544,7 +544,7 @@ u32 amdgpu_atombios_crtc_set_dce_clock(struct amdgpu_device *adev, args.v2_1.asParam.ulDCEClkFreq =cpu_to_le32 (freq);/* 10kHz units */ args.v2_1.asParam.ucDCEClkType = clk_type; args.v2_1.asParam.ucDCEClkSrc = clk_src; -amdgpu_atom_execute_table (adev- >mode_info.atom_context, index, (uint32_t *)&args); + amdgpu_atom_execute_table(adev-Quoted 1 line
mode_info.atom_context, index,
+(uint32_t *)&args, sizeof(args));
ret_freq=le32_to_cpu(args.v2_1.asParam.ulDCEClkFreq) * 10; break; default:drivers/gpu/drm/amd/amdgpu/atombios_crtc.c +2
-1@@ -740,7 +740,7 @@ void amdgpu_atombios_crtc_program_pll(structdrm_crtc *crtc, return; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } int amdgpu_atombios_crtc_prepare_pll(struct drm_crtc *crtc, diff --git
a/drivers/gpu/drm/amd/amdgpu/atombios_dp.cb/drivers/gpu/drm/amd/amdgpu/atombios_dp.c
index87c41e0e9..622634c08100644drivers/gpu/drm/amd/amdgpu/atombios_dp.c +4
-2@@ -83,7 +83,7 @@ static int amdgpu_atombios_dp_process_aux_ch(struct amdgpu_i2c_chan *chan, args.v2.ucDelay = delay /10 ; args.v2.ucHPD_ID = chan->rec.hpd; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); *ack = args.v2.ucReplyStatus;@@ -301,7 +301,7 @@ static u8 amdgpu_atombios_dp_encoder_service(struct amdgpu_device *adev, args.ucLaneNum = lane_num; args.ucStatus =0 ; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args));return args.ucStatus; }drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +4
-2@@ -334,7 +334,7 @@ amdgpu_atombios_encoder_setup_dac(struct drm_encoder *encoder, int action) args.ucDacStandard = ATOM_DAC1_PS2; args.usPixelClock =cpu_to_le16 (amdgpu_encoder->pixel_clock /10 ); -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }@@ -431,7 +431,7 @@ amdgpu_atombios_encoder_setup_dvo(struct drm_encoder *encoder, int action) break; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } int amdgpu_atombios_encoder_get_encoder_mode(struct drm_encoder*encoder) @@ -731,7 +731,7 @@ amdgpu_atombios_encoder_setup_dig_encoder(struct
drm_encoder*encoder,break; }- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +2
-0+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }@@ -1135,7 +1135,7 @@amdgpu_atombios_encoder_setup_dig_transmitter(struct
drm_encoder*encoder, int abreak; }- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +2
-0+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }bool @@ -1163,7 +1163,7 @@amdgpu_atombios_encoder_set_edp_panel_power(struct
drm_connector*connector,args.v1.ucAction = action;- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +2
-0+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args));/* wait for the panel to power up */ if (action == ATOM_TRANSMITTER_ACTION_POWER_ON) { @@ -1287,7 +1287,7 @@ amdgpu_atombios_encoder_setup_external_encoder(struct
drm_encoder*encoder,DRM_ERROR("Unknown table version: %d, %d\n", frev, crev); return; }- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +4
-1+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } static void@@ -1632,7 +1632,7 @@ amdgpu_atombios_encoder_set_crtc_source(struct drm_encoder *encoder) return; } -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); } /* This only needs to be called once at startup */ @@ -1705,7 +1705,7 @@amdgpu_atombios_encoder_dac_load_detect(struct
drm_encoder*encoder,
args.sDacload.ucMisc =DAC_LOAD_MISC_YPrPb; }- amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context, index, (
uint32_t*)&args);+ amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context, index,
drivers/gpu/drm/amd/amdgpu/atombios_encoders.c +1
-0+(uint32_t *)&args, sizeof(args));return true; }else drivers/gpu/drm/amd/amdgpu/atombios_i2c.c +2
-1@@ -86,7 +86,7 @@ static int amdgpu_atombios_i2c_process_i2c_ch(struct amdgpu_i2c_chan *chan, args.ucSlaveAddr = slave_addr <<1 ; args.ucLineNumber = chan->rec.i2c_id; -amdgpu_atom_execute_table (adev->mode_info.atom_context, index, (uint32_t *)&args); +amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args));/* error */ if (args.ucStatus != HW_ASSISTED_I2C_STATUS_SUCCESS) { @@ -172,5 +172,5 @@ void amdgpu_atombios_i2c_channel_trans(struct
amdgpu_device*adev, u8slave_addrargs.ucSlaveAddr = slave_addr; args.ucLineNumber = line_number;- amdgpu_atom_execute_table(adev->mode_info.atom_context, index,
(uint32_t*)&args);drivers/gpu/drm/amd/amdgpu/atombios_i2c.c +2
-0+amdgpu_atom_execute_table (adev->mode_info.atom_context, index, +(uint32_t *)&args,sizeof (args)); }drivers/gpu/drm/amd/display/dc/bios/command_table.c +1
-1@@ -37,7 +37,7 @@#define EXEC_BIOS_CMD_TABLE (command, params)\ (amdgpu_atom_execute_table(((struct amdgpu_device *)bp- >base.ctx->driver_context)->mode_info.atom_context, \ GetIndexIntoMasterTable(COMMAND, command), \ - (uint32_t *)¶ms) == 0) + (uint32_t *)¶ms, sizeof(params)) == 0)#define BIOS_CMD_TABLE_REVISION (command, frev, crev)\amdgpu_atom_parse_cmd_header(((struct
amdgpu_device*)bp-Quoted 1 line
base.ctx->driver_context)->mode_info.atom_context, \ diff --git
a/drivers/gpu/drm/amd/display/dc/bios/command_table2.cb/drivers/gpu/drm/amd/display/dc/bios/command_table2.cindex90a02d7bd..2bf407b9b100644drivers/gpu/drm/amd/display/dc/bios/command_table2.c +1
-1@@ -49,7 +49,7 @@#define EXEC_BIOS_CMD_TABLE (fname, params)\ (amdgpu_atom_execute_table(((struct amdgpu_device *)bp- >base.ctx->driver_context)->mode_info.atom_context, \ GET_INDEX_INTO_MASTER_TABLE(command, fname), \ - (uint32_t *)¶ms) == 0) + (uint32_t *)¶ms, sizeof(params)) == 0)#define BIOS_CMD_TABLE_REVISION (fname, frev, crev)\amdgpu_atom_parse_cmd_header(((struct
amdgpu_device*)bp-Quoted 1 line
base.ctx->driver_context)->mode_info.atom_context, \ diff --git
a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.cb/drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.cindexf503e61fa..8f5895473100644drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +3
-2@@ -226,7 +226,7 @@ int atomctrl_set_engine_dram_timings_rv770(return amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , DynamicMemorySettings), - (uint32_t *)&engine_clock_parameters); + (uint32_t *)&engine_clock_parameters, +sizeof (engine_clock_parameters)); }/* @@ -297,7 +297,7 @@ int atomctrl_get_memory_pll_dividers_si( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ComputeMemoryClockParam), - (uint32_t *)&mpll_parameters); + (uint32_t *)&mpll_parameters,sizeof (mpll_parameters));if (0 == result) { mpll_param->mpll_fb_divider.clk_frac = @@ -345,7 +345,7@@ int atomctrl_get_memory_pll_dividers_vi(struct
pp_hwmgr*hwmgr,result = amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context,
GetIndexIntoMasterTable(COMMAND,
ComputeMemoryClockParam),drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1- (uint32_t *)&mpll_parameters); + (uint32_t *)&mpll_parameters,
sizeof(mpll_parameters));if (!result) mpll_param->mpll_post_divider =drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -366,7 +366,7 @@ int atomctrl_get_memory_pll_dividers_ai(structpp_hwmgr *hwmgr, result = amdgpu_atom_execute_table(adev- >mode_info.atom_context, GetIndexIntoMasterTable(COMMAND, ComputeMemoryClockParam), - (uint32_t *)&mpll_parameters); + (uint32_t *)&mpll_parameters,
sizeof(mpll_parameters));/* VEGAM's mpll takes sometime to finish computing */ udelay(10);drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -396,7 +396,7 @@ int atomctrl_get_engine_pll_dividers_kong(structpp_hwmgr *hwmgr, result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ComputeMemoryEnginePLL), - (uint32_t *)&pll_parameters); + (uint32_t *)&pll_parameters,sizeof (pll_parameters));if (0 == result) { dividers->pll_post_divider = pll_parameters.ucPostDiv; @@ -420,7 +420,7 @@ int atomctrl_get_engine_pll_dividers_vi(
result = amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context,
GetIndexIntoMasterTable(COMMAND,
ComputeMemoryEnginePLL),drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +2
-2- (uint32_t *)&pll_patameters); + (uint32_t *)&pll_patameters, sizeof(pll_patameters));if (0 == result) { dividers->pll_post_divider =@@ -457,7 +457,7 @@ int atomctrl_get_engine_pll_dividers_ai(structpp_hwmgr *hwmgr, result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ComputeMemoryEnginePLL), - (uint32_t *)&pll_patameters); + (uint32_t *)&pll_patameters,sizeof (pll_patameters));if (0 == result) { dividers->usSclk_fcw_frac =
le16_to_cpu(pll_patameters.usSclk_fcw_frac);drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -490,7 +490,7 @@ int atomctrl_get_dfs_pll_dividers_vi( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ComputeMemoryEnginePLL), - (uint32_t *)&pll_patameters); + (uint32_t *)&pll_patameters,sizeof (pll_patameters));if (0 == result) { dividers->pll_post_divider =drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -773,7 +773,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -794,7 +794,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -814,7 +814,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -835,7 +835,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -857,7 +857,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -878,7 +878,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1@@ -909,7 +909,7 @@ int atomctrl_calculate_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&sOutput_FuseValues); + (uint32_t *)&sOutput_FuseValues,sizeof (sOutput_FuseValues));if (result) return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +2
-1@@ -1134,7 +1134,7 @@ int atomctrl_get_voltage_evv_on_sclk( result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , GetVoltageInfo), - (uint32_t *)&get_voltage_info_param_space); + (uint32_t *)&get_voltage_info_param_space, +sizeof (get_voltage_info_param_space)); *voltage = result ?0 : le16_to_cpu(((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_2 *) @@ -1179,7 +1179,7 @@ int atomctrl_get_voltage_evv(struct
pp_hwmgr*hwmgr,result = amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context,
GetIndexIntoMasterTable(COMMAND,
GetVoltageInfo),drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +3
-2- (uint32_t *)&get_voltage_info_param_space); + (uint32_t *)&get_voltage_info_param_space, +sizeof(get_voltage_info_param_space));if (0 != result)return result;@@ -1359,7 +1359,7 @@ int atomctrl_read_efuse(struct pp_hwmgr *hwmgr, uint16_t start_index, result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , ReadEfuseValue), - (uint32_t *)&efuse_param); + (uint32_t *)&efuse_param,sizeof (efuse_param));*efuse = result ? 0 : le32_to_cpu(efuse_param.ulEfuseValue) & mask; return result;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +2
-1@@ -1380,7 +1380,7 @@ int atomctrl_set_ac_timing_ai(struct pp_hwmgr *hwmgr, uint32_t memory_clock, result =amdgpu_atom_execute_table (adev- >mode_info.atom_context,GetIndexIntoMasterTable (COMMAND , DynamicMemorySettings), - (uint32_t *)&memory_clock_parameters); + (uint32_t *)&memory_clock_parameters, +sizeof (memory_clock_parameters));return result; }@@ -1399,7 +1399,7 @@ int atomctrl_get_voltage_evv_on_sclk_ai(struct
pp_hwmgr*hwmgr,uint8_tvoltage_result = amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context,
GetIndexIntoMasterTable(COMMAND,
GetVoltageInfo),drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +2
-1- (uint32_t *)&get_voltage_info_param_space); + (uint32_t *)&get_voltage_info_param_space, +sizeof(get_voltage_info_param_space)); *voltage = result ?0 : le32_to_cpu(((GET_EVV_VOLTAGE_INFO_OUTPUT_PARAMETER_V1_3 *)(&get_voltage_info_param_space))->ulVoltageLevel);
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +0
-0@@ -1526,7 +1526,7 @@ int atomctrl_get_leakage_id_from_efuse(struct
pp_hwmgr*hwmgr,uint16_t*virtualresult = amdgpu_atom_execute_table(adev-
Quoted 1 line
mode_info.atom_context,
GetIndexIntoMasterTable(COMMAND, SetVoltage),drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c +1
-1- (uint32_t *)voltage_parameters); + (uint32_t *)voltage_parameters,
sizeof(voltage_parameters));*virtual_voltage_id = voltage_parameters->usVoltageLevel;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ppatomfwctrl.c +4
-2@@ -258,7 +258,7 @@ int pp_atomfwctrl_get_gpu_pll_dividers_vega10(struct pp_hwmgr *hwmgr, idx =GetIndexIntoMasterCmdTable (computegpuclockparam);if (amdgpu_atom_execute_table ( - adev->mode_info.atom_context, idx, (uint32_t *)&pll_parameters)) + adev->mode_info.atom_context, idx, (uint32_t *)&pll_parameters, +sizeof(pll_parameters)))return -EINVAL ; pll_output = (struct compute_gpu_clock_output_parameter_v1_8 *)@@ -505,7 +505,7 @@ int pp_atomfwctrl_get_clk_information_by_clkid(struct pp_hwmgr *hwmgr, ix =GetIndexIntoMasterCmdTable (getsmuclockinfo);if (amdgpu_atom_execute_table ( - adev->mode_info.atom_context, ix, (uint32_t *)¶meters)) + adev->mode_info.atom_context, ix, (uint32_t *)¶meters, +sizeof(parameters)))return -EINVAL ; output = (struct atom_get_smu_clock_info_output_parameters_v3_1*)¶meters; diff --git
a/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.cb/drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c
index5a314d031..2e7f8d5cf100644drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c +1
-1@@ -514,7 +514,7 @@ static int smu_v11_0_atom_get_smu_clockinfo(struct amdgpu_device *adev, getsmuclockinfo); ret =amdgpu_atom_execute_table (adev->mode_info.atom_context, index, - (uint32_t *)&input); + (uint32_t *)&input,sizeof (input));if (ret)return -EINVAL;drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c +1
-1@@ -301,7 +301,7 @@ static int smu_v12_0_atom_get_smu_clockinfo(struct amdgpu_device *adev, getsmuclockinfo); ret =amdgpu_atom_execute_table (adev->mode_info.atom_context, index, - (uint32_t *)&input); + (uint32_t *)&input,sizeof (input));if (ret)return -EINVAL;--
2.43.0
PATCH 2/2 drm/radeon: check PS, WS index
In reply to AlexanderFrom: Alexander Richards <[email protected]>
Theoretically, it would be possible for a buggy or malicious VBIOS to overwrite past the bounds of the passed parameters (or its own workspace); add bounds checking to prevent this from happening.
--- drivers/gpu/drm/radeon/atom.c | 47 +++++++++++++++------- drivers/gpu/drm/radeon/atom.h | 4 +- drivers/gpu/drm/radeon/atombios_crtc.c | 28 ++++++------- drivers/gpu/drm/radeon/atombios_dp.c | 4 +- drivers/gpu/drm/radeon/atombios_encoders.c | 38 ++++++++--------- drivers/gpu/drm/radeon/atombios_i2c.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 44 ++++++++++---------- 7 files changed, 93 insertions(+), 74 deletions(-)
drivers/gpu/drm/radeon/atom.c +33 -14
@@ -60,6 +60,7 @@ typedef struct { struct atom_context *ctx; uint32_t *ps, *ws; + int ps_size, ws_size; int ps_shift; uint16_t start; unsigned last_jump;
@@ -68,8 +69,8 @@ typedef struct { } atom_exec_context;int atom_debug =0 ; -static int atom_execute_table_locked (struct atom_context *ctx,int index,uint32_t *params); -int atom_execute_table (struct atom_context *ctx,int index,uint32_t *params); +static int atom_execute_table_locked (struct atom_context *ctx,int index,uint32_t *params,int params_size); +int atom_execute_table (struct atom_context *ctx,int index,uint32_t *params,int params_size);static uint32_t atom_arg_mask[8 ] = {0xFFFFFFFF ,0x0000FFFF ,0x00FFFF00 ,0xFFFF0000 ,
@@ -221,7 +222,10 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr, (*ptr)++;/* get_unaligned_le32 avoids unaligned accesses from atombios * tables, noticed on a DEC Alpha. */ - val =get_unaligned_le32 ((u32 *)&ctx->ps[idx]); +if (idx < ctx->ps_size) + val =get_unaligned_le32 ((u32 *)&ctx->ps[idx]); +else +pr_info ("PS index out of range: %i > %i\n" , idx, ctx->ps_size);if (print)DEBUG ("PS[0x%02X,0x%04X]" , idx, val);break ;
@@ -259,7 +263,10 @@ static uint32_t atom_get_src_int(atom_exec_context *ctx, uint8_t attr, val = gctx->reg_block;break ;default : - val = ctx->ws[idx]; +if (idx < ctx->ws_size) + val = ctx->ws[idx]; +else +pr_info ("WS index out of range: %i > %i\n" , idx, ctx->ws_size); }break ;case ATOM_ARG_ID :
@@ -494,6 +501,10 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr, idx =U8 (*ptr); (*ptr)++;DEBUG ("PS[0x%02X]" , idx); +if (idx >= ctx->ps_size) { +pr_info ("PS index out of range: %i > %i\n" , idx, ctx->ps_size); +return ; + } ctx->ps[idx] =cpu_to_le32 (val);break ;case ATOM_ARG_WS :
@@ -526,6 +537,10 @@ static void atom_put_dst(atom_exec_context *ctx, int arg, uint8_t attr, gctx->reg_block = val;break ;default : +if (idx >= ctx->ws_size) { +pr_info ("WS index out of range: %i > %i\n" , idx, ctx->ws_size); +return ; + } ctx->ws[idx] = val; }break ;
@@ -623,7 +638,7 @@ static void atom_op_calltable(atom_exec_context *ctx, int *ptr, int arg)else SDEBUG (" table: %d\n" , idx);if (U16 (ctx->ctx->cmd_table +4 +2 * idx)) - r =atom_execute_table_locked (ctx->ctx, idx, ctx->ps + ctx->ps_shift); + r =atom_execute_table_locked (ctx->ctx, idx, ctx->ps + ctx->ps_shift, ctx->ps_size - ctx->ps_shift);if (r) { ctx->abort = true; }
@@ -1152,7 +1167,7 @@ static struct { atom_op_shr, ATOM_ARG_MC}, { atom_op_debug, 0},}; -static int atom_execute_table_locked (struct atom_context *ctx,int index,uint32_t *params) +static int atom_execute_table_locked (struct atom_context *ctx,int index,uint32_t *params,int params_size) {int base =CU16 (ctx->cmd_table +4 +2 * index);int len, ws, ps, ptr;
@@ -1174,12 +1189,16 @@ static int atom_execute_table_locked(struct atom_context *ctx, int index, uint32 ectx.ps_shift = ps /4 ; ectx.start = base; ectx.ps = params; + ectx.ps_size = params_size; ectx.abort = false; ectx.last_jump =0 ; -if (ws) +if (ws) { ectx.ws =kcalloc (4 , ws,GFP_KERNEL ); -else + ectx.ws_size = ws; + }else { ectx.ws =NULL ; + ectx.ws_size =0 ; + } debug_depth++;while (1 ) {
@@ -1212,7 +1231,7 @@ static int atom_execute_table_locked(struct atom_context *ctx, int index, uint32return ret; } -int atom_execute_table_scratch_unlocked (struct atom_context *ctx,int index,uint32_t *params) +int atom_execute_table_scratch_unlocked (struct atom_context *ctx,int index,uint32_t *params,int params_size) {int r;
@@ -1228,16 +1247,16 @@ int atom_execute_table_scratch_unlocked(struct atom_context *ctx, int index, uin/* reset divmul */ ctx->divmul[0 ] =0 ; ctx->divmul[1 ] =0 ; - r =atom_execute_table_locked (ctx, index, params); + r =atom_execute_table_locked (ctx, index, params, params_size);mutex_unlock (&ctx->mutex);return r; } -int atom_execute_table (struct atom_context *ctx,int index,uint32_t *params) +int atom_execute_table (struct atom_context *ctx,int index,uint32_t *params,int params_size) {int r;mutex_lock (&ctx->scratch_mutex); - r =atom_execute_table_scratch_unlocked (ctx, index, params); + r =atom_execute_table_scratch_unlocked (ctx, index, params, params_size);mutex_unlock (&ctx->scratch_mutex);return r; }
@@ -1335,7 +1354,7 @@ int atom_asic_init(struct atom_context *ctx)if (!CU16 (ctx->cmd_table +4 +2 *ATOM_CMD_INIT ))return 1 ; - ret =atom_execute_table (ctx,ATOM_CMD_INIT , ps); + ret =atom_execute_table (ctx,ATOM_CMD_INIT , ps,16 );if (ret)return ret;
@@ -1343,7 +1362,7 @@ int atom_asic_init(struct atom_context *ctx)if (rdev->family <CHIP_R600 ) {if (CU16 (ctx->cmd_table +4 +2 *ATOM_CMD_SPDFANCNTL )) -atom_execute_table (ctx,ATOM_CMD_SPDFANCNTL , ps); +atom_execute_table (ctx,ATOM_CMD_SPDFANCNTL , ps,16 ); }return ret; }
drivers/gpu/drm/radeon/atom.h +2 -2
@@ -145,8 +145,8 @@ struct atom_context {extern int atom_debug;struct atom_context *atom_parse (struct card_info *,void *); -int atom_execute_table (struct atom_context *,int ,uint32_t *); -int atom_execute_table_scratch_unlocked (struct atom_context *,int ,uint32_t *); +int atom_execute_table (struct atom_context *,int ,uint32_t *,int ); +int atom_execute_table_scratch_unlocked (struct atom_context *,int ,uint32_t *,int );int atom_asic_init (struct atom_context *);void atom_destroy (struct atom_context *); bool atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size,
drivers/gpu/drm/radeon/atombios_crtc.c +14 -14
@@ -77,7 +77,7 @@ static void atombios_overscan_setup(struct drm_crtc *crtc, args.usOverscanTop =cpu_to_le16 (radeon_crtc->v_border);break ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }static void atombios_scaler_setup (struct drm_crtc *crtc)
@@ -157,7 +157,7 @@ static void atombios_scaler_setup(struct drm_crtc *crtc)break ; } } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));if ((is_tv || is_cv) && rdev->family >=CHIP_RV515 && rdev->family <=CHIP_R580 ) {atom_rv515_force_tv_scaler (rdev, radeon_crtc);
@@ -178,7 +178,7 @@ static void atombios_lock_crtc(struct drm_crtc *crtc, int lock) args.ucCRTC = radeon_crtc->crtc_id; args.ucEnable = lock; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }static void atombios_enable_crtc (struct drm_crtc *crtc,int state)
@@ -194,7 +194,7 @@ static void atombios_enable_crtc(struct drm_crtc *crtc, int state) args.ucCRTC = radeon_crtc->crtc_id; args.ucEnable = state; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }static void atombios_enable_crtc_memreq (struct drm_crtc *crtc,int state)
@@ -210,7 +210,7 @@ static void atombios_enable_crtc_memreq(struct drm_crtc *crtc, int state) args.ucCRTC = radeon_crtc->crtc_id; args.ucEnable = state; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } static const u32 vga_control_regs[6] =
@@ -242,7 +242,7 @@ static void atombios_blank_crtc(struct drm_crtc *crtc, int state) args.ucCRTC = radeon_crtc->crtc_id; args.ucBlanking = state; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));if (ASIC_IS_DCE8 (rdev))WREG32 (vga_control_regs[radeon_crtc->crtc_id], vga_control);
@@ -261,7 +261,7 @@ static void atombios_powergate_crtc(struct drm_crtc *crtc, int state) args.ucDispPipeId = radeon_crtc->crtc_id; args.ucEnable = state; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void atombios_crtc_dpms (struct drm_crtc *crtc,int mode)
@@ -343,7 +343,7 @@ atombios_set_crtc_dtd_timing(struct drm_crtc *crtc, args.susModeMiscInfo.usAccess =cpu_to_le16 (misc); args.ucCRTC = radeon_crtc->crtc_id; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } static void atombios_crtc_set_timing(struct drm_crtc *crtc,
@@ -389,7 +389,7 @@ static void atombios_crtc_set_timing(struct drm_crtc *crtc, args.susModeMiscInfo.usAccess =cpu_to_le16 (misc); args.ucCRTC = radeon_crtc->crtc_id; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }static void atombios_disable_ss (struct radeon_device *rdev,int pll_id)
@@ -546,7 +546,7 @@ static void atombios_crtc_program_ss(struct radeon_device *rdev, args.lvds_ss.ucSpreadSpectrumStepSize_Delay |= (ss->delay &7 ) <<4 ; args.lvds_ss.ucEnable = enable; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }union adjust_pixel_clock {
@@ -692,7 +692,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc,ADJUST_DISPLAY_CONFIG_SS_ENABLE ;atom_execute_table (rdev->mode_info.atom_context, - index, (uint32_t *)&args); + index, (uint32_t *)&args,sizeof (args)); adjusted_clock =le16_to_cpu (args.v1.usPixelClock) *10 ;break ;case 3 :
@@ -725,7 +725,7 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, args.v3.sInput.ucExtTransmitterID =0 ;atom_execute_table (rdev->mode_info.atom_context, - index, (uint32_t *)&args); + index, (uint32_t *)&args,sizeof (args)); adjusted_clock =le32_to_cpu (args.v3.sOutput.ulDispPllFreq) *10 ;if (args.v3.sOutput.ucRefDiv) { radeon_crtc->pll_flags |=RADEON_PLL_USE_FRAC_FB_DIV ;
@@ -809,7 +809,7 @@ static void atombios_crtc_set_disp_eng_pll(struct radeon_device *rdev,DRM_ERROR ("Unknown table version %d %d\n" , frev, crev);return ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } static void atombios_crtc_program_pll(struct drm_crtc *crtc,
@@ -949,7 +949,7 @@ static void atombios_crtc_program_pll(struct drm_crtc *crtc,return ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }static bool atombios_crtc_prepare_pll (struct drm_crtc *crtc,struct drm_display_mode *mode)
drivers/gpu/drm/radeon/atombios_dp.c +2 -2
@@ -112,7 +112,7 @@ static int radeon_process_aux_ch(struct radeon_i2c_chan *chan,if (ASIC_IS_DCE4 (rdev)) args.v2.ucHPD_ID = chan->rec.hpd; -atom_execute_table_scratch_unlocked (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table_scratch_unlocked (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); *ack = args.v1.ucReplyStatus;
@@ -354,7 +354,7 @@ static u8 radeon_dp_encoder_service(struct radeon_device *rdev, args.ucLaneNum = lane_num; args.ucStatus =0 ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));return args.ucStatus; }
drivers/gpu/drm/radeon/atombios_encoders.c +19 -19
@@ -118,12 +118,12 @@ atombios_set_backlight_level(struct radeon_encoder *radeon_encoder, u8 level) index =GetIndexIntoMasterTable (COMMAND , LCD1OutputControl);if (dig->backlight_level ==0 ) { args.ucAction =ATOM_LCD_BLOFF ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }else { args.ucAction =ATOM_LCD_BL_BRIGHTNESS_CONTROL ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); args.ucAction =ATOM_LCD_BLON ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }break ;case ENCODER_OBJECT_ID_INTERNAL_UNIPHY :
@@ -388,7 +388,7 @@ atombios_dac_setup(struct drm_encoder *encoder, int action) } args.usPixelClock =cpu_to_le16 (radeon_encoder->pixel_clock /10 ); -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }
@@ -444,7 +444,7 @@ atombios_tv_setup(struct drm_encoder *encoder, int action) args.sTVEncoder.usPixelClock =cpu_to_le16 (radeon_encoder->pixel_clock /10 ); -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }
@@ -545,7 +545,7 @@ atombios_dvo_setup(struct drm_encoder *encoder, int action)break ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }union lvds_encoder_control {
@@ -663,7 +663,7 @@ atombios_digital_setup(struct drm_encoder *encoder, int action)break ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }int
@@ -978,7 +978,7 @@ atombios_dig_encoder_setup2(struct drm_encoder *encoder, int action, int panel_mbreak ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }
@@ -1360,7 +1360,7 @@ atombios_dig_transmitter_setup2(struct drm_encoder *encoder, int action, uint8_tbreak ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }void
@@ -1396,7 +1396,7 @@ atombios_set_edp_panel_power(struct drm_connector *connector, int action) args.v1.ucAction = action; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));/* wait for the panel to power up */ if (action ==ATOM_TRANSMITTER_ACTION_POWER_ON ) {
@@ -1518,7 +1518,7 @@ atombios_external_encoder_setup(struct drm_encoder *encoder,DRM_ERROR ("Unknown table version: %d, %d\n" , frev, crev);return ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } static void
@@ -1553,7 +1553,7 @@ atombios_yuv_setup(struct drm_encoder *encoder, bool enable) args.ucEnable =ATOM_ENABLE ; args.ucCRTC = radeon_crtc->crtc_id; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));WREG32 (reg, temp); }
@@ -1617,10 +1617,10 @@ radeon_atom_encoder_dpms_avivo(struct drm_encoder *encoder, int mode)if (radeon_encoder->encoder_id ==ENCODER_OBJECT_ID_INTERNAL_DDI ) {u32 reg =RREG32 (RADEON_BIOS_3_SCRATCH );WREG32 (RADEON_BIOS_3_SCRATCH , reg & ~ATOM_S3_DFP2I_ACTIVE ); -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));WREG32 (RADEON_BIOS_3_SCRATCH , reg); }else -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) {if (rdev->mode_info.bl_encoder) {struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
@@ -1628,7 +1628,7 @@ radeon_atom_encoder_dpms_avivo(struct drm_encoder *encoder, int mode)atombios_set_backlight_level (radeon_encoder, dig->backlight_level); }else { args.ucAction =ATOM_LCD_BLON ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); } }break ;
@@ -1636,10 +1636,10 @@ radeon_atom_encoder_dpms_avivo(struct drm_encoder *encoder, int mode)case DRM_MODE_DPMS_SUSPEND :case DRM_MODE_DPMS_OFF : args.ucAction =ATOM_DISABLE ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT )) { args.ucAction =ATOM_LCD_BLOFF ; -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args)); }break ; }
@@ -1982,7 +1982,7 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder)return ; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));/* update scratch regs with new routing */ radeon_atombios_encoder_crtc_scratch_regs (encoder, radeon_crtc->crtc_id);
@@ -2310,7 +2310,7 @@ atombios_dac_load_detect(struct drm_encoder *encoder, struct drm_connector *conn args.sDacload.ucMisc = DAC_LOAD_MISC_YPrPb; } -atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));return true; }else
drivers/gpu/drm/radeon/atombios_i2c.c +1 -1
@@ -78,7 +78,7 @@ static int radeon_process_i2c_ch(struct radeon_i2c_chan *chan, args.ucSlaveAddr = slave_addr <<1 ; args.ucLineNumber = chan->rec.i2c_id; -atom_execute_table_scratch_unlocked (rdev->mode_info.atom_context, index, (uint32_t *)&args); +atom_execute_table_scratch_unlocked (rdev->mode_info.atom_context, index, (uint32_t *)&args,sizeof (args));/* error */ if (args.ucStatus !=HW_ASSISTED_I2C_STATUS_SUCCESS ) {
drivers/gpu/drm/radeon/radeon_atombios.c +22 -22
176 lines not on this page · raw message
Signature · 1 line
2.43.0