From: Guchun Chen Date: Tue, 17 Sep 2019 09:49:29 +0000 (+0800) Subject: drm/amdgpu: avoid null pointer dereference X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8a3e801f1924c07781e93f043a74cfa244451787;p=uclinux-h8%2Flinux.git drm/amdgpu: avoid null pointer dereference null ptr should be checked first to avoid null ptr access Signed-off-by: Guchun Chen Reviewed-by: Tao Zhou Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c index 24fecaae415c..83b681a16e56 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -1336,13 +1336,13 @@ static int amdgpu_ras_save_bad_pages(struct amdgpu_device *adev) { struct amdgpu_ras *con = amdgpu_ras_get_context(adev); struct ras_err_handler_data *data; - struct amdgpu_ras_eeprom_control *control = - &adev->psp.ras.ras->eeprom_control; + struct amdgpu_ras_eeprom_control *control; int save_count; if (!con || !con->eh_data) return 0; + control = &con->eeprom_control; data = con->eh_data; save_count = data->count - control->num_recs; /* only new entries are saved */