aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
diff options
context:
space:
mode:
authorBradley Pankow <btpankow@gmail.com>2016-02-22 20:11:47 -0500
committerAlex Deucher <alexander.deucher@amd.com>2016-02-24 12:46:05 -0500
commit827108d08070c7515c14eb47e5fa03f59cfe38cf (patch)
tree5d4cc614c8cca674f067946d07898fae3f9b8aac /drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
parentdrm/radeon/pm: adjust display configuration after powerstate (diff)
downloadlinux-dev-827108d08070c7515c14eb47e5fa03f59cfe38cf.tar.xz
linux-dev-827108d08070c7515c14eb47e5fa03f59cfe38cf.zip
amdgpu: fix NULL pointer dereference at tonga_check_states_equal
The event_data passed from pem_fini was not cleared upon initialization. This caused NULL checks to pass and cast_const_phw_tonga_power_state to attempt to dereference an invalid pointer. Clear the event_data in pem_init and pem_fini before calling pem_handle_event. Reviewed-by: Rex Zhu <Rex.Zhu@amd.com> Signed-off-by: Bradley Pankow <btpankow@gmail.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to '')
-rw-r--r--drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c b/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
index 52a3efc97f05..46410e3c7349 100644
--- a/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
+++ b/drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c
@@ -31,7 +31,7 @@
static int pem_init(struct pp_eventmgr *eventmgr)
{
int result = 0;
- struct pem_event_data event_data;
+ struct pem_event_data event_data = { {0} };
/* Initialize PowerPlay feature info */
pem_init_feature_info(eventmgr);
@@ -52,7 +52,7 @@ static int pem_init(struct pp_eventmgr *eventmgr)
static void pem_fini(struct pp_eventmgr *eventmgr)
{
- struct pem_event_data event_data;
+ struct pem_event_data event_data = { {0} };
pem_uninit_featureInfo(eventmgr);
pem_unregister_interrupts(eventmgr);