diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-08 11:59:37 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2016-06-08 21:23:21 +0200 |
commit | 3fc661a98c8046a27dcf45a63049ee6605ebd364 (patch) | |
tree | 0468b8f3c8d4aa13ecce333ab3ad84146263cbc4 /target/linux/brcm2708/patches-4.4/0275-drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch | |
parent | c17f02d2f272c6d74b20c2df050437f761d013a6 (diff) | |
download | upstream-3fc661a98c8046a27dcf45a63049ee6605ebd364.tar.gz upstream-3fc661a98c8046a27dcf45a63049ee6605ebd364.tar.bz2 upstream-3fc661a98c8046a27dcf45a63049ee6605ebd364.zip |
brcm2708: update linux 4.4 patches to latest version
As usual these patches were extracted from the raspberry pi repo:
https://github.com/raspberrypi/linux/tree/rpi-4.4.y
Also alphabetically order sound-soc kernel packages.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.4/0275-drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.4/0275-drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/target/linux/brcm2708/patches-4.4/0275-drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch b/target/linux/brcm2708/patches-4.4/0275-drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch deleted file mode 100644 index 9645422820..0000000000 --- a/target/linux/brcm2708/patches-4.4/0275-drm-vc4-copy_to_user-returns-the-number-of-bytes-rem.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 543efa41ce1be43b927ddbb6c999063f8f4f9caa Mon Sep 17 00:00:00 2001 -From: Dan Carpenter <dan.carpenter@oracle.com> -Date: Thu, 17 Dec 2015 15:36:28 +0300 -Subject: [PATCH 275/304] drm/vc4: copy_to_user() returns the number of bytes - remaining - -The copy_to/from_user() functions return the number of bytes remaining -to be copied. We want to return error codes here. - -Also it's a bad idea to print an error message if a copy from user fails -because users can use that to spam /var/log/messages which is annoying -so I removed those. - -Fixes: 214613656b51 ('drm/vc4: Add an interface for capturing the GPU state after a hang.') -Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> -Reviewed-by: Eric Anholt <eric@anholt.net> -(cherry picked from commit 65c4777de54a39b2722a4b1ff3306d044014d511) ---- - drivers/gpu/drm/vc4/vc4_gem.c | 37 ++++++++++++++++++------------------- - 1 file changed, 18 insertions(+), 19 deletions(-) - ---- a/drivers/gpu/drm/vc4/vc4_gem.c -+++ b/drivers/gpu/drm/vc4/vc4_gem.c -@@ -85,7 +85,7 @@ vc4_get_hang_state_ioctl(struct drm_devi - struct vc4_dev *vc4 = to_vc4_dev(dev); - unsigned long irqflags; - u32 i; -- int ret; -+ int ret = 0; - - spin_lock_irqsave(&vc4->job_lock, irqflags); - kernel_state = vc4->hang_state; -@@ -133,9 +133,11 @@ vc4_get_hang_state_ioctl(struct drm_devi - bo_state[i].size = vc4_bo->base.base.size; - } - -- ret = copy_to_user((void __user *)(uintptr_t)get_state->bo, -- bo_state, -- state->bo_count * sizeof(*bo_state)); -+ if (copy_to_user((void __user *)(uintptr_t)get_state->bo, -+ bo_state, -+ state->bo_count * sizeof(*bo_state))) -+ ret = -EFAULT; -+ - kfree(bo_state); - - err_free: -@@ -563,27 +565,24 @@ vc4_get_bcl(struct drm_device *dev, stru - exec->shader_state = temp + exec_size; - exec->shader_state_size = args->shader_rec_count; - -- ret = copy_from_user(bin, -- (void __user *)(uintptr_t)args->bin_cl, -- args->bin_cl_size); -- if (ret) { -- DRM_ERROR("Failed to copy in bin cl\n"); -+ if (copy_from_user(bin, -+ (void __user *)(uintptr_t)args->bin_cl, -+ args->bin_cl_size)) { -+ ret = -EFAULT; - goto fail; - } - -- ret = copy_from_user(exec->shader_rec_u, -- (void __user *)(uintptr_t)args->shader_rec, -- args->shader_rec_size); -- if (ret) { -- DRM_ERROR("Failed to copy in shader recs\n"); -+ if (copy_from_user(exec->shader_rec_u, -+ (void __user *)(uintptr_t)args->shader_rec, -+ args->shader_rec_size)) { -+ ret = -EFAULT; - goto fail; - } - -- ret = copy_from_user(exec->uniforms_u, -- (void __user *)(uintptr_t)args->uniforms, -- args->uniforms_size); -- if (ret) { -- DRM_ERROR("Failed to copy in uniforms cl\n"); -+ if (copy_from_user(exec->uniforms_u, -+ (void __user *)(uintptr_t)args->uniforms, -+ args->uniforms_size)) { -+ ret = -EFAULT; - goto fail; - } - |