From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Christian_K=c3=b6nig?= Date: Wed, 04 Nov 2015 14:10:32 +0000 Subject: Re: [patch] drm/amdgpu: cleanup on error in amdgpu_cs_ioctl() Message-Id: <563A11D8.20804@vodafone.de> List-Id: References: <20151104132509.GB20966@mwanda> In-Reply-To: <20151104132509.GB20966@mwanda> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable To: Dan Carpenter , David Airlie , Chunming Zhou Cc: =?UTF-8?B?TWFyZWsgT2zFocOhaw==?= , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , "monk.liu" On 04.11.2015 14:25, Dan Carpenter wrote: > We recently changed the locking in this function and now there is a > missing unlock on error. Also there are some other resources that we > should probably release as well... > > Fixes: f48b2659f521 ('drm/amdgpu: fix the broken vm->mutex V2') > Signed-off-by: Dan Carpenter Yeah indeed, thanks for catching this. Patch is Reviewed-by: Christian K=F6nig > --- > I'm not terribly familiar with this code. Please review this one a bit > carefully. > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd= /amdgpu/amdgpu_cs.c > index 27ef528..dfc4d02 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c > @@ -876,8 +876,10 @@ int amdgpu_cs_ioctl(struct drm_device *dev, void *da= ta, struct drm_file *filp) > struct amdgpu_job *job; > struct amdgpu_ring * ring =3D parser->ibs->ring; > job =3D kzalloc(sizeof(struct amdgpu_job), GFP_KERNEL); > - if (!job) > - return -ENOMEM; > + if (!job) { > + r =3D -ENOMEM; > + goto out; > + } > job->base.sched =3D &ring->sched; > job->base.s_entity =3D &parser->ctx->rings[ring->idx].entity; > job->adev =3D parser->adev; -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" = in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?Q?Christian_K=c3=b6nig?= Subject: Re: [patch] drm/amdgpu: cleanup on error in amdgpu_cs_ioctl() Date: Wed, 4 Nov 2015 15:10:32 +0100 Message-ID: <563A11D8.20804@vodafone.de> References: <20151104132509.GB20966@mwanda> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; Format="flowed" Content-Transfer-Encoding: base64 Return-path: Received: from pegasos-out.vodafone.de (pegasos-out.vodafone.de [80.84.1.38]) by gabe.freedesktop.org (Postfix) with ESMTP id 60EAF6E80B for ; Wed, 4 Nov 2015 06:10:42 -0800 (PST) In-Reply-To: <20151104132509.GB20966@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 , David Airlie , Chunming Zhou Cc: =?UTF-8?B?TWFyZWsgT2zFocOhaw==?= , kernel-janitors@vger.kernel.org, dri-devel@lists.freedesktop.org, Alex Deucher , "monk.liu" List-Id: dri-devel@lists.freedesktop.org T24gMDQuMTEuMjAxNSAxNDoyNSwgRGFuIENhcnBlbnRlciB3cm90ZToKPiBXZSByZWNlbnRseSBj aGFuZ2VkIHRoZSBsb2NraW5nIGluIHRoaXMgZnVuY3Rpb24gYW5kIG5vdyB0aGVyZSBpcyBhCj4g bWlzc2luZyB1bmxvY2sgb24gZXJyb3IuICBBbHNvIHRoZXJlIGFyZSBzb21lIG90aGVyIHJlc291 cmNlcyB0aGF0IHdlCj4gc2hvdWxkIHByb2JhYmx5IHJlbGVhc2UgYXMgd2VsbC4uLgo+Cj4gRml4 ZXM6IGY0OGIyNjU5ZjUyMSAoJ2RybS9hbWRncHU6IGZpeCB0aGUgYnJva2VuIHZtLT5tdXRleCBW MicpCj4gU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUu Y29tPgoKWWVhaCBpbmRlZWQsIHRoYW5rcyBmb3IgY2F0Y2hpbmcgdGhpcy4KClBhdGNoIGlzIFJl dmlld2VkLWJ5OiBDaHJpc3RpYW4gS8O2bmlnIDxjaHJpc3RpYW4ua29lbmlnQGFtZC5jb20+Cgo+ IC0tLQo+IEknbSBub3QgdGVycmlibHkgZmFtaWxpYXIgd2l0aCB0aGlzIGNvZGUuICBQbGVhc2Ug cmV2aWV3IHRoaXMgb25lIGEgYml0Cj4gY2FyZWZ1bGx5Lgo+Cj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jIGIvZHJpdmVycy9ncHUvZHJtL2FtZC9h bWRncHUvYW1kZ3B1X2NzLmMKPiBpbmRleCAyN2VmNTI4Li5kZmM0ZDAyIDEwMDY0NAo+IC0tLSBh L2RyaXZlcnMvZ3B1L2RybS9hbWQvYW1kZ3B1L2FtZGdwdV9jcy5jCj4gKysrIGIvZHJpdmVycy9n cHUvZHJtL2FtZC9hbWRncHUvYW1kZ3B1X2NzLmMKPiBAQCAtODc2LDggKzg3NiwxMCBAQCBpbnQg YW1kZ3B1X2NzX2lvY3RsKHN0cnVjdCBkcm1fZGV2aWNlICpkZXYsIHZvaWQgKmRhdGEsIHN0cnVj dCBkcm1fZmlsZSAqZmlscCkKPiAgIAkJc3RydWN0IGFtZGdwdV9qb2IgKmpvYjsKPiAgIAkJc3Ry dWN0IGFtZGdwdV9yaW5nICogcmluZyA9ICBwYXJzZXItPmlicy0+cmluZzsKPiAgIAkJam9iID0g a3phbGxvYyhzaXplb2Yoc3RydWN0IGFtZGdwdV9qb2IpLCBHRlBfS0VSTkVMKTsKPiAtCQlpZiAo IWpvYikKPiAtCQkJcmV0dXJuIC1FTk9NRU07Cj4gKwkJaWYgKCFqb2IpIHsKPiArCQkJciA9IC1F Tk9NRU07Cj4gKwkJCWdvdG8gb3V0Owo+ICsJCX0KPiAgIAkJam9iLT5iYXNlLnNjaGVkID0gJnJp bmctPnNjaGVkOwo+ICAgCQlqb2ItPmJhc2Uuc19lbnRpdHkgPSAmcGFyc2VyLT5jdHgtPnJpbmdz W3JpbmctPmlkeF0uZW50aXR5Owo+ICAgCQlqb2ItPmFkZXYgPSBwYXJzZXItPmFkZXY7CgpfX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFp bGluZyBsaXN0CmRyaS1kZXZlbEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZy ZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo=