Skip to content

Commit

Permalink
drm/radeon/si: make sure mc ucode is loaded before checking the size
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Alex Deucher authored and Christian König committed Apr 17, 2014
1 parent f8a2645 commit 8c79bae
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/gpu/drm/radeon/si.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 8c79bae

Please sign in to comment.