OSDN Git Service

drm/amdkfd: fix improper return value on error
authorPan Bian <bianpan2016@163.com>
Thu, 1 Dec 2016 08:10:42 +0000 (16:10 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 8 Oct 2017 08:14:17 +0000 (10:14 +0200)
[ Upstream commit 8bf793883da213864efc50c274d2b38ec0ca58b2 ]

In function kfd_wait_on_events(), when the call to copy_from_user()
fails, the value of return variable ret is 0. 0 indicates success, which
is inconsistent with the execution status. This patch fixes the bug by
assigning "-EFAULT" to ret when copy_from_user() returns an unexpected
value.

Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/amdkfd/kfd_events.c

index b6e28dc..1fb1daa 100644 (file)
@@ -739,8 +739,10 @@ int kfd_wait_on_events(struct kfd_process *p,
                struct kfd_event_data event_data;
 
                if (copy_from_user(&event_data, &events[i],
-                               sizeof(struct kfd_event_data)))
+                               sizeof(struct kfd_event_data))) {
+                       ret = -EFAULT;
                        goto fail;
+               }
 
                ret = init_event_waiter(p, &event_waiters[i],
                                event_data.event_id, i);