diff options
author | Alex Deucher <alexdeucher@gmail.com> | 2014-04-16 09:42:22 -0400 |
---|---|---|
committer | Christian König <christian.koenig@amd.com> | 2014-04-17 08:14:41 -0400 |
commit | 8c79bae6a30f606b7a4e17c994bc5f72f8fdaf11 (patch) | |
tree | a8fad897868c75f5766f69ce427e93d8525386b7 | |
parent | f8a2645ecede4eaf90b3d785f2805c8ecb76d43e (diff) |
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
-rw-r--r-- | drivers/gpu/drm/radeon/si.c | 4 |
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) | |||
1472 | const __be32 *fw_data; | 1472 | const __be32 *fw_data; |
1473 | u32 running, blackout = 0; | 1473 | u32 running, blackout = 0; |
1474 | u32 *io_mc_regs; | 1474 | u32 *io_mc_regs; |
1475 | int i, regs_size, ucode_size = rdev->mc_fw->size / 4; | 1475 | int i, regs_size, ucode_size; |
1476 | 1476 | ||
1477 | if (!rdev->mc_fw) | 1477 | if (!rdev->mc_fw) |
1478 | return -EINVAL; | 1478 | return -EINVAL; |
1479 | 1479 | ||
1480 | ucode_size = rdev->mc_fw->size / 4; | ||
1481 | |||
1480 | switch (rdev->family) { | 1482 | switch (rdev->family) { |
1481 | case CHIP_TAHITI: | 1483 | case CHIP_TAHITI: |
1482 | io_mc_regs = (u32 *)&tahiti_io_mc_regs; | 1484 | io_mc_regs = (u32 *)&tahiti_io_mc_regs; |