summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAlex Deucher <alexdeucher@gmail.com>2014-04-16 09:42:22 -0400
committerChristian König <christian.koenig@amd.com>2014-04-17 14:14:41 +0200
commit8c79bae6a30f606b7a4e17c994bc5f72f8fdaf11 (patch)
treea8fad897868c75f5766f69ce427e93d8525386b7 /drivers
parentf8a2645ecede4eaf90b3d785f2805c8ecb76d43e (diff)
downloadlinux-8c79bae6a30f606b7a4e17c994bc5f72f8fdaf11.tar.bz2
drm/radeon/si: make sure mc ucode is loaded before checking the size
Avoid a possible segfault. Noticed-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/radeon/si.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 86f8c9c87f5c..ac708e006180 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -1472,11 +1472,13 @@ int si_mc_load_microcode(struct radeon_device *rdev)
const __be32 *fw_data;
u32 running, blackout = 0;
u32 *io_mc_regs;
- int i, regs_size, ucode_size = rdev->mc_fw->size / 4;
+ int i, regs_size, ucode_size;
if (!rdev->mc_fw)
return -EINVAL;
+ ucode_size = rdev->mc_fw->size / 4;
+
switch (rdev->family) {
case CHIP_TAHITI:
io_mc_regs = (u32 *)&tahiti_io_mc_regs;