* [PATCH][next] drm/amdkfd: fix null pointer dereference on dev
@ 2019-05-29 15:07 Colin King
2019-05-29 21:29 ` Kuehling, Felix
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2019-05-29 15:07 UTC (permalink / raw)
To: Oded Gabbay, Alex Deucher, Christian König, David Zhou,
David Airlie, Daniel Vetter, dri-devel, amd-gfx, Oak Zeng,
Felix Kuehling
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
The pointer dev is set to null yet it is being dereferenced when
checking dev->dqm->sched_policy. Fix this by performing the check
on dev->dqm->sched_policy after dev has been assigned and null
checked. Also remove the redundant null assignment to dev.
Addresses-Coverity: ("Explicit null dereference")
Fixes: 1a058c337676 ("drm/amdkfd: New IOCTL to allocate queue GWS")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
index aab2aa6c1dee..ea82828fdc76 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
@@ -1572,10 +1572,9 @@ static int kfd_ioctl_alloc_queue_gws(struct file *filep,
{
int retval;
struct kfd_ioctl_alloc_queue_gws_args *args = data;
- struct kfd_dev *dev = NULL;
+ struct kfd_dev *dev;
- if (!hws_gws_support ||
- dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
+ if (!hws_gws_support)
return -EINVAL;
dev = kfd_device_by_id(args->gpu_id);
@@ -1583,6 +1582,8 @@ static int kfd_ioctl_alloc_queue_gws(struct file *filep,
pr_debug("Could not find gpu id 0x%x\n", args->gpu_id);
return -EINVAL;
}
+ if (dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
+ return -EINVAL;
mutex_lock(&p->mutex);
retval = pqm_set_gws(&p->pqm, args->queue_id, args->num_gws ? dev->gws : NULL);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] drm/amdkfd: fix null pointer dereference on dev
2019-05-29 15:07 [PATCH][next] drm/amdkfd: fix null pointer dereference on dev Colin King
@ 2019-05-29 21:29 ` Kuehling, Felix
0 siblings, 0 replies; 2+ messages in thread
From: Kuehling, Felix @ 2019-05-29 21:29 UTC (permalink / raw)
To: Colin King, Oded Gabbay, Deucher, Alexander, Koenig, Christian,
Zhou, David(ChunMing), David Airlie, Daniel Vetter,
dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org,
Zeng, Oak
Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
On 2019-05-29 11:07 a.m., Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> The pointer dev is set to null yet it is being dereferenced when
> checking dev->dqm->sched_policy. Fix this by performing the check
> on dev->dqm->sched_policy after dev has been assigned and null
> checked. Also remove the redundant null assignment to dev.
>
> Addresses-Coverity: ("Explicit null dereference")
> Fixes: 1a058c337676 ("drm/amdkfd: New IOCTL to allocate queue GWS")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Thanks!
Felix
> ---
> drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> index aab2aa6c1dee..ea82828fdc76 100644
> --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c
> @@ -1572,10 +1572,9 @@ static int kfd_ioctl_alloc_queue_gws(struct file *filep,
> {
> int retval;
> struct kfd_ioctl_alloc_queue_gws_args *args = data;
> - struct kfd_dev *dev = NULL;
> + struct kfd_dev *dev;
>
> - if (!hws_gws_support ||
> - dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
> + if (!hws_gws_support)
> return -EINVAL;
>
> dev = kfd_device_by_id(args->gpu_id);
> @@ -1583,6 +1582,8 @@ static int kfd_ioctl_alloc_queue_gws(struct file *filep,
> pr_debug("Could not find gpu id 0x%x\n", args->gpu_id);
> return -EINVAL;
> }
> + if (dev->dqm->sched_policy == KFD_SCHED_POLICY_NO_HWS)
> + return -EINVAL;
>
> mutex_lock(&p->mutex);
> retval = pqm_set_gws(&p->pqm, args->queue_id, args->num_gws ? dev->gws : NULL);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-29 21:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-29 15:07 [PATCH][next] drm/amdkfd: fix null pointer dereference on dev Colin King
2019-05-29 21:29 ` Kuehling, Felix
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox