Skip to content

Commit

Permalink
drm: fix NULL pointer access by wrong ioctl
Browse files Browse the repository at this point in the history
If user uses wrong ioctl command with _IOC_NONE and argument size
greater than 0, it can cause NULL pointer access from memset of line
463. If _IOC_NONE, don't memset to 0 for kdata.

Signed-off-by: Zhaowei Yuan <zhaowei.yuan@samsung.com>
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Zhaowei Yuan authored and Dave Airlie committed Jun 25, 2014
1 parent a497c3b commit 1539fb9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/gpu/drm/drm_drv.c
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,9 @@ long drm_ioctl(struct file *filp,
retcode = -EFAULT;
goto err_i1;
}
} else
} else if (cmd & IOC_OUT) {
memset(kdata, 0, usize);
}

if (ioctl->flags & DRM_UNLOCKED)
retcode = func(dev, kdata, file_priv);
Expand Down

0 comments on commit 1539fb9

Please sign in to comment.