All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
@ 2017-04-03 18:41 ` Dan Carpenter
  0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2017-04-03 18:41 UTC (permalink / raw)
  To: Alex Deucher, Christian König
  Cc: kernel-janitors, amd-gfx, dri-devel, Junwei Zhang,
	Edward O'Callaghan, Alex Xie

We accidentally dereference "cb" if the kmalloc() fails.

Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 0235d7933efd..45a1bcfc41f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct amdgpu_device *adev,
 		if (fence)
 			dma_fence_wait(fence, false);
 
-		amdgpu_vm_prt_put(cb->adev);
+		amdgpu_vm_prt_put(adev);
 	} else {
 		cb->adev = adev;
 		if (!fence || dma_fence_add_callback(fence, &cb->cb,

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
@ 2017-04-03 18:41 ` Dan Carpenter
  0 siblings, 0 replies; 8+ messages in thread
From: Dan Carpenter @ 2017-04-03 18:41 UTC (permalink / raw)
  To: Alex Deucher, Christian König
  Cc: kernel-janitors, amd-gfx, dri-devel, Junwei Zhang,
	Edward O'Callaghan, Alex Xie

We accidentally dereference "cb" if the kmalloc() fails.

Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 0235d7933efd..45a1bcfc41f7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct amdgpu_device *adev,
 		if (fence)
 			dma_fence_wait(fence, false);
 
-		amdgpu_vm_prt_put(cb->adev);
+		amdgpu_vm_prt_put(adev);
 	} else {
 		cb->adev = adev;
 		if (!fence || dma_fence_add_callback(fence, &cb->cb,
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
  2017-04-03 18:41 ` Dan Carpenter
@ 2017-04-03 18:53   ` Harry Wentland
  -1 siblings, 0 replies; 8+ messages in thread
From: Harry Wentland @ 2017-04-03 18:53 UTC (permalink / raw)
  To: Dan Carpenter, Alex Deucher, Christian König
  Cc: kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Junwei Zhang,
	Edward O'Callaghan, Alex Xie

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

On 2017-04-03 02:41 PM, Dan Carpenter wrote:
> We accidentally dereference "cb" if the kmalloc() fails.
>
> Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 0235d7933efd..45a1bcfc41f7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct amdgpu_device *adev,
>  		if (fence)
>  			dma_fence_wait(fence, false);
>
> -		amdgpu_vm_prt_put(cb->adev);
> +		amdgpu_vm_prt_put(adev);
>  	} else {
>  		cb->adev = adev;
>  		if (!fence || dma_fence_add_callback(fence, &cb->cb,
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
@ 2017-04-03 18:53   ` Harry Wentland
  0 siblings, 0 replies; 8+ messages in thread
From: Harry Wentland @ 2017-04-03 18:53 UTC (permalink / raw)
  To: Dan Carpenter, Alex Deucher, Christian König
  Cc: kernel-janitors-u79uwXL29TY76Z2rM5mHXA,
	dri-devel-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW,
	amd-gfx-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW, Junwei Zhang,
	Edward O'Callaghan, Alex Xie

Reviewed-by: Harry Wentland <harry.wentland@amd.com>

Harry

On 2017-04-03 02:41 PM, Dan Carpenter wrote:
> We accidentally dereference "cb" if the kmalloc() fails.
>
> Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> index 0235d7933efd..45a1bcfc41f7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
> @@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct amdgpu_device *adev,
>  		if (fence)
>  			dma_fence_wait(fence, false);
>
> -		amdgpu_vm_prt_put(cb->adev);
> +		amdgpu_vm_prt_put(adev);
>  	} else {
>  		cb->adev = adev;
>  		if (!fence || dma_fence_add_callback(fence, &cb->cb,
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
  2017-04-03 18:53   ` Harry Wentland
@ 2017-04-03 20:36     ` Alex Deucher
  -1 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2017-04-03 20:36 UTC (permalink / raw)
  To: Harry Wentland
  Cc: Dan Carpenter, Alex Deucher, Christian König,
	kernel-janitors, Maling list - DRI developers, amd-gfx list,
	Junwei Zhang, Edward O'Callaghan, Alex Xie

On Mon, Apr 3, 2017 at 2:53 PM, Harry Wentland <harry.wentland@amd.com> wrote:
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>
> Harry
>

Applied.  thanks!

Alex

>
> On 2017-04-03 02:41 PM, Dan Carpenter wrote:
>>
>> We accidentally dereference "cb" if the kmalloc() fails.
>>
>> Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index 0235d7933efd..45a1bcfc41f7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct
>> amdgpu_device *adev,
>>                 if (fence)
>>                         dma_fence_wait(fence, false);
>>
>> -               amdgpu_vm_prt_put(cb->adev);
>> +               amdgpu_vm_prt_put(adev);
>>         } else {
>>                 cb->adev = adev;
>>                 if (!fence || dma_fence_add_callback(fence, &cb->cb,
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
@ 2017-04-03 20:36     ` Alex Deucher
  0 siblings, 0 replies; 8+ messages in thread
From: Alex Deucher @ 2017-04-03 20:36 UTC (permalink / raw)
  To: Harry Wentland
  Cc: Dan Carpenter, Alex Deucher, Christian König,
	kernel-janitors, Maling list - DRI developers, amd-gfx list,
	Junwei Zhang, Edward O'Callaghan, Alex Xie

On Mon, Apr 3, 2017 at 2:53 PM, Harry Wentland <harry.wentland@amd.com> wrote:
> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>
> Harry
>

Applied.  thanks!

Alex

>
> On 2017-04-03 02:41 PM, Dan Carpenter wrote:
>>
>> We accidentally dereference "cb" if the kmalloc() fails.
>>
>> Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> index 0235d7933efd..45a1bcfc41f7 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>> @@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct
>> amdgpu_device *adev,
>>                 if (fence)
>>                         dma_fence_wait(fence, false);
>>
>> -               amdgpu_vm_prt_put(cb->adev);
>> +               amdgpu_vm_prt_put(adev);
>>         } else {
>>                 cb->adev = adev;
>>                 if (!fence || dma_fence_add_callback(fence, &cb->cb,
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
  2017-04-03 20:36     ` Alex Deucher
@ 2017-04-04  6:34       ` Christian König
  -1 siblings, 0 replies; 8+ messages in thread
From: Christian König @ 2017-04-04  6:34 UTC (permalink / raw)
  To: Alex Deucher, Harry Wentland
  Cc: Dan Carpenter, Alex Deucher, kernel-janitors,
	Maling list - DRI developers, amd-gfx list, Junwei Zhang,
	Edward O'Callaghan, Alex Xie

Am 03.04.2017 um 22:36 schrieb Alex Deucher:
> On Mon, Apr 3, 2017 at 2:53 PM, Harry Wentland <harry.wentland@amd.com> wrote:
>> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>>
>> Harry
>>
> Applied.  thanks!

Nice catch, Reviewed-by: Christian König <christian.koenig@amd.com> if 
Alex still wants to add that.

Christian.

>
> Alex
>
>> On 2017-04-03 02:41 PM, Dan Carpenter wrote:
>>> We accidentally dereference "cb" if the kmalloc() fails.
>>>
>>> Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> index 0235d7933efd..45a1bcfc41f7 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> @@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct
>>> amdgpu_device *adev,
>>>                  if (fence)
>>>                          dma_fence_wait(fence, false);
>>>
>>> -               amdgpu_vm_prt_put(cb->adev);
>>> +               amdgpu_vm_prt_put(adev);
>>>          } else {
>>>                  cb->adev = adev;
>>>                  if (!fence || dma_fence_add_callback(fence, &cb->cb,
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx


--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 8+ messages in thread
* Re: [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb()
@ 2017-04-04  6:34       ` Christian König
  0 siblings, 0 replies; 8+ messages in thread
From: Christian König @ 2017-04-04  6:34 UTC (permalink / raw)
  To: Alex Deucher, Harry Wentland
  Cc: Dan Carpenter, Alex Deucher, kernel-janitors,
	Maling list - DRI developers, amd-gfx list, Junwei Zhang,
	Edward O'Callaghan, Alex Xie

Am 03.04.2017 um 22:36 schrieb Alex Deucher:
> On Mon, Apr 3, 2017 at 2:53 PM, Harry Wentland <harry.wentland@amd.com> wrote:
>> Reviewed-by: Harry Wentland <harry.wentland@amd.com>
>>
>> Harry
>>
> Applied.  thanks!

Nice catch, Reviewed-by: Christian König <christian.koenig@amd.com> if 
Alex still wants to add that.

Christian.

>
> Alex
>
>> On 2017-04-03 02:41 PM, Dan Carpenter wrote:
>>> We accidentally dereference "cb" if the kmalloc() fails.
>>>
>>> Fixes: 451bc8eb8fe6 ("drm/amdgpu: fix PRT teardown on VM fini v3")
>>> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> index 0235d7933efd..45a1bcfc41f7 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>>> @@ -1518,7 +1518,7 @@ static void amdgpu_vm_add_prt_cb(struct
>>> amdgpu_device *adev,
>>>                  if (fence)
>>>                          dma_fence_wait(fence, false);
>>>
>>> -               amdgpu_vm_prt_put(cb->adev);
>>> +               amdgpu_vm_prt_put(adev);
>>>          } else {
>>>                  cb->adev = adev;
>>>                  if (!fence || dma_fence_add_callback(fence, &cb->cb,
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>>>
>> _______________________________________________
>> amd-gfx mailing list
>> amd-gfx@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/amd-gfx



^ permalink raw reply	[flat|nested] 8+ messages in thread
end of thread, other threads:[~2017-04-04  6:34 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-03 18:41 [PATCH] drm/amdgpu: Fix a NULL deref in amdgpu_vm_add_prt_cb() Dan Carpenter
2017-04-03 18:41 ` Dan Carpenter
2017-04-03 18:53 ` Harry Wentland
2017-04-03 18:53   ` Harry Wentland
2017-04-03 20:36   ` Alex Deucher
2017-04-03 20:36     ` Alex Deucher
2017-04-04  6:34     ` Christian König
2017-04-04  6:34       ` Christian König

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.