On Tue, May 21, 2024 at 05:52:19PM +0530, Ajay Kaher wrote: > From: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx> > > [ Upstream commit b8d55a90fd55b767c25687747e2b24abd1ef8680 ] > > Return invalid error code -EINVAL for invalid block id. > > Fixes the below: > > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c:1183 amdgpu_ras_query_error_status_helper() error: we previously assumed 'info' could be null (see line 1176) > > Suggested-by: Hawking Zhang <Hawking.Zhang@xxxxxxx> > Cc: Tao Zhou <tao.zhou1@xxxxxxx> > Cc: Hawking Zhang <Hawking.Zhang@xxxxxxx> > Cc: Christian König <christian.koenig@xxxxxxx> > Cc: Alex Deucher <alexander.deucher@xxxxxxx> > Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@xxxxxxx> > Reviewed-by: Hawking Zhang <Hawking.Zhang@xxxxxxx> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > [Ajay: applied AMDGPU_RAS_BLOCK_COUNT condition to amdgpu_ras_error_query() > as amdgpu_ras_query_error_status_helper() not present in v5.10, v5.4 > amdgpu_ras_query_error_status_helper() was introduced in 8cc0f5669eb6] > Signed-off-by: Ajay Kaher <ajay.kaher@xxxxxxxxxxxx> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 3 +++ > 1 file changed, 3 insertions(+) All now queued up, thanks. greg k-h
