Skip to contentSkip to conversation

drivers/gpu/drm/radeon: move a dereference below a NULL test

PATCH Darren Jenkins 2 participants 2 messages Dec 24, 2009 – Dec 25, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

If a NULL value is possible, the dereference should only occur after the NULL test.

(quoted diff) +0 -0

b/drivers/gpu/drm/radeon/radeon_irq.c
index b79ecc4..2f349a3 100644

drivers/gpu/drm/radeon/radeon_irq.c +0 -0
@@ -289,16 +289,16 @@ int radeon_irq_emit(struct drm_device *dev, void

*data, struct drm_file *file_pr
drm_radeon_irq_emit_t *emit = data;
int result;

- if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
- return -EINVAL;
-
- LOCK_TEST_WITH_RETURN(dev, file_priv);
-
if (!dev_priv) {
DRM_ERROR("called with no initialization\n"); return -EINVAL;
}

+ if ((dev_priv->flags & RADEON_FAMILY_MASK) >= CHIP_R600)
+ return -EINVAL;
+
+ LOCK_TEST_WITH_RETURN(dev, file_priv);
+
result = radeon_emit_irq(dev);

if (DRM_COPY_TO_USER(emit->irq_seq, &result, sizeof(int))) {

#1 lore raw

drivers/gpu/drm/radeon/radeon_irq.c int radeon_irq_emit(struct drm_device *dev, void · line 289

Quoted 11 lines · Darren Jenkins

If a NULL value is possible, the dereference should only occur after the NULL test.

drivers/gpu/drm/radeon/radeon_irq.c +0 -0
index b79ecc4..2f349a3 100644
@@ -289,16 +289,16 @@ int radeon_irq_emit(struct drm_device *dev, void
 *data, struct drm_file *file_pr

Looks like your patches are whitespace-damaged. You'll need to fix your MUA...

Cheers,
Julien