From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Date: Mon, 17 Dec 2018 07:00:38 +0000 Subject: [PATCH] drm: Fix an error pointer dereference() Message-Id: <20181217065733.GA12159@kadam> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Maarten Lankhorst , Daniel Vetter Cc: Maxime Ripard , David Airlie , kernel-janitors@vger.kernel.org, Sean Paul , dri-devel@lists.freedesktop.org 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. 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Carpenter Subject: [PATCH] drm: Fix an error pointer dereference() Date: Mon, 17 Dec 2018 10:00:38 +0300 Message-ID: <20181217065733.GA12159@kadam> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from aserp2130.oracle.com (aserp2130.oracle.com [141.146.126.79]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA1A36E3AC for ; Mon, 17 Dec 2018 10:24:28 +0000 (UTC) Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Maarten Lankhorst , Daniel Vetter Cc: Maxime Ripard , David Airlie , kernel-janitors@vger.kernel.org, Sean Paul , dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org VGhlIGRybV9tb2RlX2NyZWF0ZV90aWxlX2dyb3VwKCkgaXMgb25seSBjYWxsZWQgZnJvbQpkcm1f cGFyc2VfdGlsZWRfYmxvY2soKSBhbmQgdGhlIGNhbGxlciBleHBlY3RzIGl0IHRvIHJldHVybiBh IE5VTEwgb24KZXJyb3IuICBJbiBvdGhlciB3b3JkcywgdGhpcyBmdW5jdGlvbiBzaG91bGQgbWF0 Y2gKZHJtX21vZGVfZ2V0X3RpbGVfZ3JvdXAoKS4KClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50 ZXIgPGRhbi5jYXJwZW50ZXJAb3JhY2xlLmNvbT4KLS0tCkkgc2VudCBhIHZlcnNpb24gb2YgdGhp cyBwYXRjaCBsYXN0IHllYXIgd2hpY2ggdXBkYXRlZApkcm1fcGFyc2VfdGlsZWRfYmxvY2soKSB0 byBjaGVjayBmb3IgZXJyb3IgcG9pbnRlcnMuICBEYW5pZWwgVmV0dGVyCnNhaWQgdGhhdCB0aGVy ZSB3YXMgYW5vdGhlciBjYWxsZXIgaW4gdGhlIG1zbSBjb2RlLCBidXQgSSBkb24ndCB0aGluawp0 aGVyZSBpcyBub3cuCgoKIGRyaXZlcnMvZ3B1L2RybS9kcm1fY29ubmVjdG9yLmMgfCA2ICsrKy0t LQogMSBmaWxlIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vZHJtX2Nvbm5lY3Rvci5jIGIvZHJpdmVycy9ncHUvZHJt L2RybV9jb25uZWN0b3IuYwppbmRleCBkYThhZTgwYzI3NTAuLjM5NzExNzRmNmFlZCAxMDA2NDQK LS0tIGEvZHJpdmVycy9ncHUvZHJtL2RybV9jb25uZWN0b3IuYworKysgYi9kcml2ZXJzL2dwdS9k cm0vZHJtX2Nvbm5lY3Rvci5jCkBAIC0yMDc3LDcgKzIwNzcsNyBAQCBFWFBPUlRfU1lNQk9MKGRy bV9tb2RlX2dldF90aWxlX2dyb3VwKTsKICAqIGlkZW50aWZpZXIgZm9yIHRoZSB0aWxlIGdyb3Vw LgogICoKICAqIFJFVFVSTlM6Ci0gKiBuZXcgdGlsZSBncm91cCBvciBlcnJvci4KKyAqIG5ldyB0 aWxlIGdyb3VwIG9yIE5VTEwuCiAgKi8KIHN0cnVjdCBkcm1fdGlsZV9ncm91cCAqZHJtX21vZGVf Y3JlYXRlX3RpbGVfZ3JvdXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAkJCQkJCSAgY2hhciB0 b3BvbG9neVs4XSkKQEAgLTIwODcsNyArMjA4Nyw3IEBAIHN0cnVjdCBkcm1fdGlsZV9ncm91cCAq ZHJtX21vZGVfY3JlYXRlX3RpbGVfZ3JvdXAoc3RydWN0IGRybV9kZXZpY2UgKmRldiwKIAogCXRn ID0ga3phbGxvYyhzaXplb2YoKnRnKSwgR0ZQX0tFUk5FTCk7CiAJaWYgKCF0ZykKLQkJcmV0dXJu IEVSUl9QVFIoLUVOT01FTSk7CisJCXJldHVybiBOVUxMOwogCiAJa3JlZl9pbml0KCZ0Zy0+cmVm Y291bnQpOwogCW1lbWNweSh0Zy0+Z3JvdXBfZGF0YSwgdG9wb2xvZ3ksIDgpOwpAQCAtMjA5OSw3 ICsyMDk5LDcgQEAgc3RydWN0IGRybV90aWxlX2dyb3VwICpkcm1fbW9kZV9jcmVhdGVfdGlsZV9n cm91cChzdHJ1Y3QgZHJtX2RldmljZSAqZGV2LAogCQl0Zy0+aWQgPSByZXQ7CiAJfSBlbHNlIHsK IAkJa2ZyZWUodGcpOwotCQl0ZyA9IEVSUl9QVFIocmV0KTsKKwkJdGcgPSBOVUxMOwogCX0KIAog CW11dGV4X3VubG9jaygmZGV2LT5tb2RlX2NvbmZpZy5pZHJfbXV0ZXgpOwotLSAKMi4xNy4xCgpf X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwg bWFpbGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0 cy5mcmVlZGVza3RvcC5vcmcvbWFpbG1hbi9saXN0aW5mby9kcmktZGV2ZWwK