diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2009-12-09 17:39:16 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-12-10 15:09:06 +1000 |
| commit | 4a04a844ba0c09b5641bf2ebd9f9517aa76e52fb (patch) | |
| tree | b859af52ab72db2632e0d7da7cc0cf6552f3d136 /drivers/gpu | |
| parent | b27b63750d912e80d61d2120c4a1664062d0f808 (diff) | |
| download | linux-4a04a844ba0c09b5641bf2ebd9f9517aa76e52fb.tar.gz linux-4a04a844ba0c09b5641bf2ebd9f9517aa76e52fb.tar.bz2 linux-4a04a844ba0c09b5641bf2ebd9f9517aa76e52fb.zip | |
drm/radeon/kms: Fix NULL ptr dereference
radeon_atombios_fini might be call while there is not valid
atombios structure allocated, thus test for a not null ptr
before trying to access this structure.
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 7e55647f118e..410859ee112f 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -487,8 +487,10 @@ int radeon_atombios_init(struct radeon_device *rdev) void radeon_atombios_fini(struct radeon_device *rdev) { - kfree(rdev->mode_info.atom_context->scratch); - kfree(rdev->mode_info.atom_context); + if (rdev->mode_info.atom_context) { + kfree(rdev->mode_info.atom_context->scratch); + kfree(rdev->mode_info.atom_context); + } kfree(rdev->mode_info.atom_card_info); } |