diff options
| author | Alex Deucher <alexdeucher@gmail.com> | 2014-04-16 09:42:22 -0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-06 12:38:13 +0200 |
| commit | 5bbd7bffabfb02b0467ccd3c6ade2b32c738eb70 (patch) | |
| tree | 127dca22c020f65510d709535ec4de6cb5e277a2 | |
| parent | 0f9aed4142002f86e1eef78a2506e8c650f2a85a (diff) | |
| download | lwn-5bbd7bffabfb02b0467ccd3c6ade2b32c738eb70.tar.gz lwn-5bbd7bffabfb02b0467ccd3c6ade2b32c738eb70.zip | |
drm/radeon/si: make sure mc ucode is loaded before checking the size
commit 8c79bae6a30f606b7a4e17c994bc5f72f8fdaf11 upstream.
Avoid a possible segfault.
Noticed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 de0c2bfcc7fc..bbd83f5aa75d 100644 --- a/drivers/gpu/drm/radeon/si.c +++ b/drivers/gpu/drm/radeon/si.c @@ -1475,11 +1475,13 @@ static 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; |