diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2014-04-16 09:42:23 -0400 |
|---|---|---|
| committer | Christian König <christian.koenig@amd.com> | 2014-04-17 14:14:43 +0200 |
| commit | bcddee29b0b87af3aeda953840f97b356b24dc5e (patch) | |
| tree | d06ada61b523d46d77d3f48c4bfafb711c1adbaf /drivers/gpu/drm/radeon | |
| parent | 8c79bae6a30f606b7a4e17c994bc5f72f8fdaf11 (diff) | |
| download | op-kernel-dev-bcddee29b0b87af3aeda953840f97b356b24dc5e.zip op-kernel-dev-bcddee29b0b87af3aeda953840f97b356b24dc5e.tar.gz | |
drm/radeon/ci: 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/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/cik.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 7e43045..199eb19 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -1705,11 +1705,13 @@ int ci_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_BONAIRE: io_mc_regs = (u32 *)&bonaire_io_mc_regs; |
