From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Date: Mon, 25 Apr 2016 09:10:12 +0000 Subject: Re: [patch] drm: atmel-hlcdc: fix a NULL check Message-Id: <20160425111012.5e06978e@bbrezillon> List-Id: References: <20160425090454.GA25366@mwanda> In-Reply-To: <20160425090454.GA25366@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Brezillon Subject: Re: [patch] drm: atmel-hlcdc: fix a NULL check Date: Mon, 25 Apr 2016 11:10:12 +0200 Message-ID: <20160425111012.5e06978e@bbrezillon> References: <20160425090454.GA25366@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by gabe.freedesktop.org (Postfix) with ESMTP id 644E26E545 for ; Mon, 25 Apr 2016 09:10:14 +0000 (UTC) In-Reply-To: <20160425090454.GA25366@mwanda> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dan Carpenter Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCAyNSBBcHIgMjAxNiAxMjowNDo1NCArMDMwMApEYW4gQ2FycGVudGVyIDxkYW4uY2Fy cGVudGVyQG9yYWNsZS5jb20+IHdyb3RlOgoKPiBJZiBrbWFsbG9jKCkgcmV0dXJuZWQgTlVMTCB3 ZSB3b3VsZCBlbmQgdXAgZGVyZWZlcmVuY2luZyAic3RhdGUiIGEKPiBjb3VwbGUgbGluZXMgbGF0 ZXIuCj4gCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFj bGUuY29tPgoKQWNrZWQtYnk6IEJvcmlzIEJyZXppbGxvbiA8Ym9yaXMuYnJlemlsbG9uQGZyZWUt ZWxlY3Ryb25zLmNvbT4KClRoYW5rcywKCkJvcmlzCgo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJz L2dwdS9kcm0vYXRtZWwtaGxjZGMvYXRtZWxfaGxjZGNfY3J0Yy5jIGIvZHJpdmVycy9ncHUvZHJt L2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2NydGMuYwo+IGluZGV4IDhkZjBhYWYuLjg2NzA2OWIg MTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9ncHUvZHJtL2F0bWVsLWhsY2RjL2F0bWVsX2hsY2RjX2Ny dGMuYwo+ICsrKyBiL2RyaXZlcnMvZ3B1L2RybS9hdG1lbC1obGNkYy9hdG1lbF9obGNkY19jcnRj LmMKPiBAQCAtNDE1LDggKzQxNSw5IEBAIGF0bWVsX2hsY2RjX2NydGNfZHVwbGljYXRlX3N0YXRl KHN0cnVjdCBkcm1fY3J0YyAqY3J0YykKPiAgCQlyZXR1cm4gTlVMTDsKPiAgCj4gIAlzdGF0ZSA9 IGttYWxsb2Moc2l6ZW9mKCpzdGF0ZSksIEdGUF9LRVJORUwpOwo+IC0JaWYgKHN0YXRlKQo+IC0J CV9fZHJtX2F0b21pY19oZWxwZXJfY3J0Y19kdXBsaWNhdGVfc3RhdGUoY3J0YywgJnN0YXRlLT5i YXNlKTsKPiArCWlmICghc3RhdGUpCj4gKwkJcmV0dXJuIE5VTEw7Cj4gKwlfX2RybV9hdG9taWNf aGVscGVyX2NydGNfZHVwbGljYXRlX3N0YXRlKGNydGMsICZzdGF0ZS0+YmFzZSk7Cj4gIAo+ICAJ Y3VyID0gZHJtX2NydGNfc3RhdGVfdG9fYXRtZWxfaGxjZGNfY3J0Y19zdGF0ZShjcnRjLT5zdGF0 ZSk7Cj4gIAlzdGF0ZS0+b3V0cHV0X21vZGUgPSBjdXItPm91dHB1dF9tb2RlOwoKCgotLSAKQm9y aXMgQnJlemlsbG9uLCBGcmVlIEVsZWN0cm9ucwpFbWJlZGRlZCBMaW51eCBhbmQgS2VybmVsIGVu Z2luZWVyaW5nCmh0dHA6Ly9mcmVlLWVsZWN0cm9ucy5jb20KX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2 ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21h aWxtYW4vbGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 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 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