Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1386147

Re: [patch] drm: atmel-hlcdc: fix a NULL check

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch] drm: atmel-hlcdc: fix a NULL check Dan Carpenter <dan.carpenter@oracle.com> - 2016-04-25 11:10 +0200
  Re: [patch] drm: atmel-hlcdc: fix a NULL check Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-04-25 11:20 +0200
  Re: [patch] drm: atmel-hlcdc: fix a NULL check Boris Brezillon <boris.brezillon@free-electrons.com> - 2016-04-25 11:20 +0200
  Re: [patch] drm: atmel-hlcdc: fix a NULL check Eric Engestrom <eric.engestrom@imgtec.com> - 2016-04-25 11:20 +0200

csiph-web