Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753617AbcDYJKR (ORCPT ); Mon, 25 Apr 2016 05:10:17 -0400 Received: from down.free-electrons.com ([37.187.137.238]:50681 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750793AbcDYJKP (ORCPT ); Mon, 25 Apr 2016 05:10:15 -0400 Date: Mon, 25 Apr 2016 11:10:12 +0200 From: Boris Brezillon To: Dan Carpenter Cc: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [patch] drm: atmel-hlcdc: fix a NULL check Message-ID: <20160425111012.5e06978e@bbrezillon> In-Reply-To: <20160425090454.GA25366@mwanda> References: <20160425090454.GA25366@mwanda> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1119 Lines: 38 On Mon, 25 Apr 2016 12:04:54 +0300 Dan Carpenter wrote: > If kmalloc() returned NULL we would end up dereferencing "state" a > couple lines later. > > Signed-off-by: Dan Carpenter Acked-by: Boris Brezillon 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