summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/pmgr/pwrdev.c
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2016-12-20 17:11:54 -0500
committermobile promotions <svcmobile_promotions@nvidia.com>2017-01-04 04:44:25 -0500
commitf37f4e27e362629d5c187817104d48d703c380cc (patch)
tree8dddaa1d926016848c6cebc4aa9f4a3612341da1 /drivers/gpu/nvgpu/pmgr/pwrdev.c
parent2a95a288b285b0eff16a8825298c416d185693fb (diff)
gpu: nvgpu: Use perf table only VBIOS supports it
We retrieve perf table from VBIOS only if respective HAL op is implemented. Later in code we unconditionally dereference the pointer which can lead to NULL pointer access. Fix by early aborting creation of devinit tables if the perf VBIOS getter is missing. Change-Id: If48aa6dac724056dd1feb2ef520e343736d4db85 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/1279223 GVS: Gerrit_Virtual_Submit Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/pmgr/pwrdev.c')
-rw-r--r--drivers/gpu/nvgpu/pmgr/pwrdev.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/pmgr/pwrdev.c b/drivers/gpu/nvgpu/pmgr/pwrdev.c
index 03e2eb34..da034b31 100644
--- a/drivers/gpu/nvgpu/pmgr/pwrdev.c
+++ b/drivers/gpu/nvgpu/pmgr/pwrdev.c
@@ -140,13 +140,14 @@ static u32 devinit_get_pwr_device_table(struct gk20a *g,
140 140
141 gk20a_dbg_info(""); 141 gk20a_dbg_info("");
142 142
143 if (g->ops.bios.get_perf_table_ptrs != NULL) { 143 if (!g->ops.bios.get_perf_table_ptrs)
144 pwr_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g, 144 return -EINVAL;
145 g->bios.perf_token, POWER_SENSORS_TABLE); 145
146 if (pwr_device_table_ptr == NULL) { 146 pwr_device_table_ptr = (u8 *)g->ops.bios.get_perf_table_ptrs(g,
147 status = -EINVAL; 147 g->bios.perf_token, POWER_SENSORS_TABLE);
148 goto done; 148 if (pwr_device_table_ptr == NULL) {
149 } 149 status = -EINVAL;
150 goto done;
150 } 151 }
151 152
152 memcpy(&pwr_sensor_table_header, pwr_device_table_ptr, 153 memcpy(&pwr_sensor_table_header, pwr_device_table_ptr,