diff options
| author | Geliang Tang | 2017-05-06 17:40:17 +0200 |
|---|---|---|
| committer | Daniel Vetter | 2017-05-08 09:28:39 +0200 |
| commit | 261aeba834f384cd9cf85be72078291d30fca4e4 (patch) | |
| tree | 1372e92d149b334a65a0c868f49912e5bf2ef5cf /drivers/gpu/drm/i915/i915_debugfs.c | |
| parent | drm/i915: Fix rawclk readout for g4x (diff) | |
| download | kernel-qcow2-linux-261aeba834f384cd9cf85be72078291d30fca4e4.tar.gz kernel-qcow2-linux-261aeba834f384cd9cf85be72078291d30fca4e4.tar.xz kernel-qcow2-linux-261aeba834f384cd9cf85be72078291d30fca4e4.zip | |
drm/i915: use memdup_user_nul
Use memdup_user_nul() helper instead of open-coding to simplify the
code.
Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/6baf3aa45d0b5e0fd016b508bac905ebf8443aac.1493779294.git.geliangtang@gmail.com
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_debugfs.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 870c470177b5..1003511f28cc 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -3702,16 +3702,10 @@ static ssize_t i915_displayport_test_active_write(struct file *file, if (len == 0) return 0; - input_buffer = kmalloc(len + 1, GFP_KERNEL); - if (!input_buffer) - return -ENOMEM; + input_buffer = memdup_user_nul(ubuf, len); + if (IS_ERR(input_buffer)) + return PTR_ERR(input_buffer); - if (copy_from_user(input_buffer, ubuf, len)) { - status = -EFAULT; - goto out; - } - - input_buffer[len] = '\0'; DRM_DEBUG_DRIVER("Copied %d bytes from user\n", (unsigned int)len); drm_connector_list_iter_begin(dev, &conn_iter); @@ -3737,7 +3731,6 @@ static ssize_t i915_displayport_test_active_write(struct file *file, } } drm_connector_list_iter_end(&conn_iter); -out: kfree(input_buffer); if (status < 0) return status; |