diff mbox

drm/nouveau/clk: fix possible NULL pointer dereference

Message ID 3009531.aHrQhHYAOc@daeseok-laptop.cloud.net (mailing list archive)
State New, archived
Headers show

Commit Message

Daeseok Youn April 15, 2014, 1:56 a.m. UTC
It need to be checking NULL before dereferencing.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
---
 drivers/gpu/drm/nouveau/core/subdev/clock/base.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Daeseok Youn April 15, 2014, 9:15 a.m. UTC | #1
2014-04-15 16:00 GMT+09:00 Ben Skeggs <bskeggs@redhat.com>:
> ----- Original Message -----
>> From: "Daeseok Youn" <daeseok.youn@gmail.com>
>> To: airlied@linux.ie
>> Cc: bskeggs@redhat.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
>> Sent: Tuesday, 15 April, 2014 11:56:49 AM
>> Subject: [PATCH] drm/nouveau/clk: fix possible NULL pointer dereference
>>
>>
>> It need to be checking NULL before dereferencing.
> There's no dereference here.  It's an address calculation only.
Oh.. You're right.
But the address calculation doesn't need when "pstate" is NULL.
Can I re-send this patch after modifying subject and comment of this
patch properly?
Or drop this patch.

Thanks for review.

Regards,
Daeseok Youn.
>
>>
>> Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
>> ---
>>  drivers/gpu/drm/nouveau/core/subdev/clock/base.c |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
>> b/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
>> index dd62bae..a586d030 100644
>> --- a/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
>> +++ b/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
>> @@ -290,9 +290,9 @@ nouveau_pstate_new(struct nouveau_clock *clk, int idx)
>>               return 0;
>>
>>       pstate = kzalloc(sizeof(*pstate), GFP_KERNEL);
>> -     cstate = &pstate->base;
>>       if (!pstate)
>>               return -ENOMEM;
>> +     cstate = &pstate->base;
>>
>>       INIT_LIST_HEAD(&pstate->list);
>>
>> --
>> 1.7.4.4
>>
>>
>>
diff mbox

Patch

diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/base.c b/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
index dd62bae..a586d030 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/clock/base.c
@@ -290,9 +290,9 @@  nouveau_pstate_new(struct nouveau_clock *clk, int idx)
 		return 0;
 
 	pstate = kzalloc(sizeof(*pstate), GFP_KERNEL);
-	cstate = &pstate->base;
 	if (!pstate)
 		return -ENOMEM;
+	cstate = &pstate->base;
 
 	INIT_LIST_HEAD(&pstate->list);