From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Date: Mon, 17 Dec 2018 09:44:06 +0000 Subject: Re: [PATCH] drm: Fix an error pointer dereference() Message-Id: <20181217094406.GZ21184@phenom.ffwll.local> List-Id: References: <20181217065733.GA12159@kadam> In-Reply-To: <20181217065733.GA12159@kadam> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Dan Carpenter Cc: Maxime Ripard , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Sean Paul On Mon, Dec 17, 2018 at 10:00:38AM +0300, Dan Carpenter wrote: > The drm_mode_create_tile_group() is only called from > drm_parse_tiled_block() and the caller expects it to return a NULL on > error. In other words, this function should match > drm_mode_get_tile_group(). > > Signed-off-by: Dan Carpenter > --- > I sent a version of this patch last year which updated > drm_parse_tiled_block() to check for error pointers. Daniel Vetter > said that there was another caller in the msm code, but I don't think > there is now. Yup, that msm callsite was removed in commit 8b03ad30e314691f7bfccc0f9fae0dffd498b667 Author: Chandan Uddaraju Date: Wed Apr 18 12:45:15 2018 -0700 drm/msm/dsi: Use one connector for dual DSI mode Thanks for resending your patch, applied for 4.22. -Daniel > > > drivers/gpu/drm/drm_connector.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c > index da8ae80c2750..3971174f6aed 100644 > --- a/drivers/gpu/drm/drm_connector.c > +++ b/drivers/gpu/drm/drm_connector.c > @@ -2077,7 +2077,7 @@ EXPORT_SYMBOL(drm_mode_get_tile_group); > * identifier for the tile group. > * > * RETURNS: > - * new tile group or error. > + * new tile group or NULL. > */ > struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev, > char topology[8]) > @@ -2087,7 +2087,7 @@ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev, > > tg = kzalloc(sizeof(*tg), GFP_KERNEL); > if (!tg) > - return ERR_PTR(-ENOMEM); > + return NULL; > > kref_init(&tg->refcount); > memcpy(tg->group_data, topology, 8); > @@ -2099,7 +2099,7 @@ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev, > tg->id = ret; > } else { > kfree(tg); > - tg = ERR_PTR(ret); > + tg = NULL; > } > > mutex_unlock(&dev->mode_config.idr_mutex); > -- > 2.17.1 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm: Fix an error pointer dereference() Date: Mon, 17 Dec 2018 10:44:06 +0100 Message-ID: <20181217094406.GZ21184@phenom.ffwll.local> References: <20181217065733.GA12159@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by gabe.freedesktop.org (Postfix) with ESMTPS id 070256E023 for ; Mon, 17 Dec 2018 09:44:11 +0000 (UTC) Received: by mail-ed1-x542.google.com with SMTP id h15so10161567edb.4 for ; Mon, 17 Dec 2018 01:44:10 -0800 (PST) Content-Disposition: inline In-Reply-To: <20181217065733.GA12159@kadam> 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: Maxime Ripard , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , Sean Paul List-Id: dri-devel@lists.freedesktop.org T24gTW9uLCBEZWMgMTcsIDIwMTggYXQgMTA6MDA6MzhBTSArMDMwMCwgRGFuIENhcnBlbnRlciB3 cm90ZToKPiBUaGUgZHJtX21vZGVfY3JlYXRlX3RpbGVfZ3JvdXAoKSBpcyBvbmx5IGNhbGxlZCBm cm9tCj4gZHJtX3BhcnNlX3RpbGVkX2Jsb2NrKCkgYW5kIHRoZSBjYWxsZXIgZXhwZWN0cyBpdCB0 byByZXR1cm4gYSBOVUxMIG9uCj4gZXJyb3IuICBJbiBvdGhlciB3b3JkcywgdGhpcyBmdW5jdGlv biBzaG91bGQgbWF0Y2gKPiBkcm1fbW9kZV9nZXRfdGlsZV9ncm91cCgpLgo+IAo+IFNpZ25lZC1v ZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KPiAtLS0KPiBJ IHNlbnQgYSB2ZXJzaW9uIG9mIHRoaXMgcGF0Y2ggbGFzdCB5ZWFyIHdoaWNoIHVwZGF0ZWQKPiBk cm1fcGFyc2VfdGlsZWRfYmxvY2soKSB0byBjaGVjayBmb3IgZXJyb3IgcG9pbnRlcnMuICBEYW5p ZWwgVmV0dGVyCj4gc2FpZCB0aGF0IHRoZXJlIHdhcyBhbm90aGVyIGNhbGxlciBpbiB0aGUgbXNt IGNvZGUsIGJ1dCBJIGRvbid0IHRoaW5rCj4gdGhlcmUgaXMgbm93LgoKWXVwLCB0aGF0IG1zbSBj YWxsc2l0ZSB3YXMgcmVtb3ZlZCBpbgoKY29tbWl0IDhiMDNhZDMwZTMxNDY5MWY3YmZjY2MwZjlm YWUwZGZmZDQ5OGI2NjcKQXV0aG9yOiBDaGFuZGFuIFVkZGFyYWp1IDxjaGFuZGFudUBjb2RlYXVy b3JhLm9yZz4KRGF0ZTogICBXZWQgQXByIDE4IDEyOjQ1OjE1IDIwMTggLTA3MDAKCiAgICBkcm0v bXNtL2RzaTogVXNlIG9uZSBjb25uZWN0b3IgZm9yIGR1YWwgRFNJIG1vZGUKICAgIApUaGFua3Mg Zm9yIHJlc2VuZGluZyB5b3VyIHBhdGNoLCBhcHBsaWVkIGZvciA0LjIyLgotRGFuaWVsCgo+IAo+ IAo+ICBkcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jIHwgNiArKystLS0KPiAgMSBmaWxl IGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKPiAKPiBkaWZmIC0tZ2l0 IGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYyBiL2RyaXZlcnMvZ3B1L2RybS9kcm1f Y29ubmVjdG9yLmMKPiBpbmRleCBkYThhZTgwYzI3NTAuLjM5NzExNzRmNmFlZCAxMDA2NDQKPiAt LS0gYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jCj4gKysrIGIvZHJpdmVycy9ncHUv ZHJtL2RybV9jb25uZWN0b3IuYwo+IEBAIC0yMDc3LDcgKzIwNzcsNyBAQCBFWFBPUlRfU1lNQk9M KGRybV9tb2RlX2dldF90aWxlX2dyb3VwKTsKPiAgICogaWRlbnRpZmllciBmb3IgdGhlIHRpbGUg Z3JvdXAuCj4gICAqCj4gICAqIFJFVFVSTlM6Cj4gLSAqIG5ldyB0aWxlIGdyb3VwIG9yIGVycm9y Lgo+ICsgKiBuZXcgdGlsZSBncm91cCBvciBOVUxMLgo+ICAgKi8KPiAgc3RydWN0IGRybV90aWxl X2dyb3VwICpkcm1fbW9kZV9jcmVhdGVfdGlsZV9ncm91cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2 LAo+ICAJCQkJCQkgIGNoYXIgdG9wb2xvZ3lbOF0pCj4gQEAgLTIwODcsNyArMjA4Nyw3IEBAIHN0 cnVjdCBkcm1fdGlsZV9ncm91cCAqZHJtX21vZGVfY3JlYXRlX3RpbGVfZ3JvdXAoc3RydWN0IGRy bV9kZXZpY2UgKmRldiwKPiAgCj4gIAl0ZyA9IGt6YWxsb2Moc2l6ZW9mKCp0ZyksIEdGUF9LRVJO RUwpOwo+ICAJaWYgKCF0ZykKPiAtCQlyZXR1cm4gRVJSX1BUUigtRU5PTUVNKTsKPiArCQlyZXR1 cm4gTlVMTDsKPiAgCj4gIAlrcmVmX2luaXQoJnRnLT5yZWZjb3VudCk7Cj4gIAltZW1jcHkodGct Pmdyb3VwX2RhdGEsIHRvcG9sb2d5LCA4KTsKPiBAQCAtMjA5OSw3ICsyMDk5LDcgQEAgc3RydWN0 IGRybV90aWxlX2dyb3VwICpkcm1fbW9kZV9jcmVhdGVfdGlsZV9ncm91cChzdHJ1Y3QgZHJtX2Rl dmljZSAqZGV2LAo+ICAJCXRnLT5pZCA9IHJldDsKPiAgCX0gZWxzZSB7Cj4gIAkJa2ZyZWUodGcp Owo+IC0JCXRnID0gRVJSX1BUUihyZXQpOwo+ICsJCXRnID0gTlVMTDsKPiAgCX0KPiAgCj4gIAlt dXRleF91bmxvY2soJmRldi0+bW9kZV9jb25maWcuaWRyX211dGV4KTsKPiAtLSAKPiAyLjE3LjEK PiAKCi0tIApEYW5pZWwgVmV0dGVyClNvZnR3YXJlIEVuZ2luZWVyLCBJbnRlbCBDb3Jwb3JhdGlv bgpodHRwOi8vYmxvZy5mZndsbC5jaApfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVl ZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5m by9kcmktZGV2ZWwK