dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [patch] drm: atmel-hlcdc: fix a NULL check
@ 2016-04-25  9:04 Dan Carpenter
  2016-04-25  9:10 ` Boris Brezillon
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Dan Carpenter @ 2016-04-25  9:04 UTC (permalink / raw)
  To: Boris Brezillon; +Cc: kernel-janitors, linux-kernel, dri-devel

If kmalloc() returned NULL we would end up dereferencing "state" a
couple lines later.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
index 8df0aaf..867069b 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
@@ -415,8 +415,9 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc)
 		return NULL;
 
 	state = kmalloc(sizeof(*state), GFP_KERNEL);
-	if (state)
-		__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
+	if (!state)
+		return NULL;
+	__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
 
 	cur = drm_crtc_state_to_atmel_hlcdc_crtc_state(crtc->state);
 	state->output_mode = cur->output_mode;
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [patch] drm: atmel-hlcdc: fix a NULL check
  2016-04-25  9:04 [patch] drm: atmel-hlcdc: fix a NULL check Dan Carpenter
@ 2016-04-25  9:10 ` Boris Brezillon
  2016-04-25  9:11 ` Eric Engestrom
  2016-04-25  9:15 ` Boris Brezillon
  2 siblings, 0 replies; 4+ messages in thread
From: Boris Brezillon @ 2016-04-25  9:10 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: kernel-janitors, linux-kernel, dri-devel

On Mon, 25 Apr 2016 12:04:54 +0300
Dan Carpenter <dan.carpenter@oracle.com> wrote:

> If kmalloc() returned NULL we would end up dereferencing "state" a
> couple lines later.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Thanks,

Boris

> 
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> index 8df0aaf..867069b 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> @@ -415,8 +415,9 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc)
>  		return NULL;
>  
>  	state = kmalloc(sizeof(*state), GFP_KERNEL);
> -	if (state)
> -		__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
> +	if (!state)
> +		return NULL;
> +	__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
>  
>  	cur = drm_crtc_state_to_atmel_hlcdc_crtc_state(crtc->state);
>  	state->output_mode = cur->output_mode;



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] drm: atmel-hlcdc: fix a NULL check
  2016-04-25  9:04 [patch] drm: atmel-hlcdc: fix a NULL check Dan Carpenter
  2016-04-25  9:10 ` Boris Brezillon
@ 2016-04-25  9:11 ` Eric Engestrom
  2016-04-25  9:15 ` Boris Brezillon
  2 siblings, 0 replies; 4+ messages in thread
From: Eric Engestrom @ 2016-04-25  9:11 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: kernel-janitors, linux-kernel, dri-devel

On Mon, Apr 25, 2016 at 12:04:54PM +0300, Dan Carpenter wrote:
> If kmalloc() returned NULL we would end up dereferencing "state" a
> couple lines later.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] drm: atmel-hlcdc: fix a NULL check
  2016-04-25  9:04 [patch] drm: atmel-hlcdc: fix a NULL check Dan Carpenter
  2016-04-25  9:10 ` Boris Brezillon
  2016-04-25  9:11 ` Eric Engestrom
@ 2016-04-25  9:15 ` Boris Brezillon
  2 siblings, 0 replies; 4+ messages in thread
From: Boris Brezillon @ 2016-04-25  9:15 UTC (permalink / raw)
  To: Dan Carpenter, Daniel Vetter; +Cc: kernel-janitors, linux-kernel, dri-devel

Hi Daniel,

On Mon, 25 Apr 2016 12:04:54 +0300
Dan Carpenter <dan.carpenter@oracle.com> wrote:

> If kmalloc() returned NULL we would end up dereferencing "state" a
> couple lines later.

Can you take this patch in drm-misc, or should I send a PR?

Regards,

Boris

> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> index 8df0aaf..867069b 100644
> --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
> @@ -415,8 +415,9 @@ atmel_hlcdc_crtc_duplicate_state(struct drm_crtc *crtc)
>  		return NULL;
>  
>  	state = kmalloc(sizeof(*state), GFP_KERNEL);
> -	if (state)
> -		__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
> +	if (!state)
> +		return NULL;
> +	__drm_atomic_helper_crtc_duplicate_state(crtc, &state->base);
>  
>  	cur = drm_crtc_state_to_atmel_hlcdc_crtc_state(crtc->state);
>  	state->output_mode = cur->output_mode;



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-04-25  9:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-25  9:04 [patch] drm: atmel-hlcdc: fix a NULL check Dan Carpenter
2016-04-25  9:10 ` Boris Brezillon
2016-04-25  9:11 ` Eric Engestrom
2016-04-25  9:15 ` Boris Brezillon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).