diff options
| author | Michel Dänzer <daenzer@vmware.com> | 2010-01-22 09:20:00 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-02-01 12:49:28 +1000 |
| commit | 17aafccab4352b422aa01fa6ebf82daff693a5b3 (patch) | |
| tree | cee643823053ccdaad63ee84e1c0a9e43f233ca0 /drivers/gpu/drm | |
| parent | f71d0187987e691516cd10c2702f002c0e2f0edc (diff) | |
| download | op-kernel-dev-17aafccab4352b422aa01fa6ebf82daff693a5b3.zip op-kernel-dev-17aafccab4352b422aa01fa6ebf82daff693a5b3.tar.gz | |
drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.
If radeon_cs_parser_init() fails, radeon_cs_ioctl() calls
radeon_cs_parser_fini() with the non-zero error value. The latter dereferenced
parser->ib which hasn't been initialized yet -> boom. Add a test for parser->ib
being non-NULL before dereferencing it.
Signed-off-by: Michel Dänzer <daenzer@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 1496cb8..1190148 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -189,7 +189,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error) { unsigned i; - if (error) { + if (error && parser->ib) { radeon_bo_list_unvalidate(&parser->validated, parser->ib->fence); } else { |
