From mboxrd@z Thu Jan 1 00:00:00 1970 From: Colin Ian King Subject: Re: [Nouveau] [PATCH] drm/nouveau/iccsense: fix memory leak on default sensor->type case Date: Fri, 3 Jun 2016 11:42:12 +0100 Message-ID: <57515F04.8000408@canonical.com> References: <1464863332-9610-1-git-send-email-colin.king@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: karol herbst Cc: Karol Herbst , nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Ben Skeggs List-Id: nouveau.vger.kernel.org T24gMDMvMDYvMTYgMTA6NTUsIGthcm9sIGhlcmJzdCB3cm90ZToKPiBIaSBDb2xpbiwKPiAKPiB0 aGFua3MgZm9yIHBvaW50aW5nIHRoaXMgb3V0LCBidXQgSSBhbSBxdWl0ZSBzdXJlIHRoaXMgY29u dGludWUKPiBzdGF0ZW1lbnQgd29uJ3QgZXZlciBiZSBoaXQsIGV2ZXIuCj4gCj4gY2hlY2sgdGhl IG52a21faWNjc2Vuc2VfY3JlYXRlX3NlbnNvciBmdW5jdGlvbi4gQSBzZW5zb3Igb2JqZWN0IHdp bGwKPiBvbmx5IGJlIGNyZWF0ZWQgZm9yIG9uZSBvZiB0aG9zZSB0aHJlZSB0eXBlcyBhbmQgb3Ro ZXJzIGRvbid0IGV4aXN0Lgo+IEkndmUganVzdCBhZGRlZCB0aGF0IGRlZmF1bHQgc3RhdGVtZW50 IHRvIHNodXQgR0NDIEkgdGhpbmsuCj4gCj4gVGhlIHRoaW5nIGlzIEkgcmV3b3JrZWQgdGhhdCBj b2RlIGFscmVhZHkgYW5kIHdpbGwgY2hlY2sgaWYgdGhpcwo+IHNpdHVhdGlvbiBzdGlsbCBhcHBs aWVzIHRoZXJlLgoKT0ssIHRoYW5rcyBmb3IgbGV0dGluZyBtZSBrbm93LiBBcG9sb2dpZXMgaWYg SSBidXJudCB1cCBzb21lIG9mIHlvdXIKdmFsdWFibGUgY3ljbGVzIG9uIHRoaXMuCgpDb2xpbgoK PiAKPiAyMDE2LTA2LTAyIDEyOjI4IEdNVCswMjowMCBDb2xpbiBLaW5nIDxjb2xpbi5raW5nQGNh bm9uaWNhbC5jb20+Ogo+PiBGcm9tOiBDb2xpbiBJYW4gS2luZyA8Y29saW4ua2luZ0BjYW5vbmlj YWwuY29tPgo+Pgo+PiBUaGUgZGVmYXVsdCBzZW5zb3ItPnR5cGUgY2FzZSBsZWFrcyBtZW1vcnkg YWxsb2NhdGVkIHRvIHJhaWwuIEZpeAo+PiB0aGlzIGJ5IGZyZWUnaW5nIHJhaWwgYmVmb3JlIHdl IGNvbnRpbnVlIHdpdGggdGhlIG5leHQgbG9vcCBpdGVyYXRpb24uCj4+Cj4+IFNpZ25lZC1vZmYt Ynk6IENvbGluIElhbiBLaW5nIDxjb2xpbi5raW5nQGNhbm9uaWNhbC5jb20+Cj4+IC0tLQo+PiAg ZHJpdmVycy9ncHUvZHJtL25vdXZlYXUvbnZrbS9zdWJkZXYvaWNjc2Vuc2UvYmFzZS5jIHwgMSAr Cj4+ICAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKykKPj4KPj4gZGlmZiAtLWdpdCBhL2Ry aXZlcnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2ljY3NlbnNlL2Jhc2UuYyBiL2RyaXZl cnMvZ3B1L2RybS9ub3V2ZWF1L252a20vc3ViZGV2L2ljY3NlbnNlL2Jhc2UuYwo+PiBpbmRleCAz MjNjNzlhLi43OWIwZWI1IDEwMDY0NAo+PiAtLS0gYS9kcml2ZXJzL2dwdS9kcm0vbm91dmVhdS9u dmttL3N1YmRldi9pY2NzZW5zZS9iYXNlLmMKPj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL25vdXZl YXUvbnZrbS9zdWJkZXYvaWNjc2Vuc2UvYmFzZS5jCj4+IEBAIC0zMDUsNiArMzA1LDcgQEAgbnZr bV9pY2NzZW5zZV9vbmVpbml0KHN0cnVjdCBudmttX3N1YmRldiAqc3ViZGV2KQo+PiAgICAgICAg ICAgICAgICAgICAgICAgICByYWlsLT5yZWFkID0gbnZrbV9pY2NzZW5zZV9pbmEzMjIxX3JlYWQ7 Cj4+ICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwo+PiAgICAgICAgICAgICAgICAgZGVm YXVsdDoKPj4gKyAgICAgICAgICAgICAgICAgICAgICAga2ZyZWUocmFpbCk7Cj4+ICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwo+PiAgICAgICAgICAgICAgICAgfQo+Pgo+PiAtLQo+ PiAyLjguMQo+Pgo+PiBfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwo+PiBOb3V2ZWF1IG1haWxpbmcgbGlzdAo+PiBOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwo+PiBodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25v dXZlYXUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRy aS1kZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRw czovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932485AbcFCKmR (ORCPT ); Fri, 3 Jun 2016 06:42:17 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:49520 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932367AbcFCKmQ (ORCPT ); Fri, 3 Jun 2016 06:42:16 -0400 Subject: Re: [Nouveau] [PATCH] drm/nouveau/iccsense: fix memory leak on default sensor->type case To: karol herbst References: <1464863332-9610-1-git-send-email-colin.king@canonical.com> Cc: Ben Skeggs , David Airlie , Martin Peres , Karol Herbst , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org From: Colin Ian King Message-ID: <57515F04.8000408@canonical.com> Date: Fri, 3 Jun 2016 11:42:12 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/06/16 10:55, karol herbst wrote: > Hi Colin, > > thanks for pointing this out, but I am quite sure this continue > statement won't ever be hit, ever. > > check the nvkm_iccsense_create_sensor function. A sensor object will > only be created for one of those three types and others don't exist. > I've just added that default statement to shut GCC I think. > > The thing is I reworked that code already and will check if this > situation still applies there. OK, thanks for letting me know. Apologies if I burnt up some of your valuable cycles on this. Colin > > 2016-06-02 12:28 GMT+02:00 Colin King : >> From: Colin Ian King >> >> The default sensor->type case leaks memory allocated to rail. Fix >> this by free'ing rail before we continue with the next loop iteration. >> >> Signed-off-by: Colin Ian King >> --- >> drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c >> index 323c79a..79b0eb5 100644 >> --- a/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c >> +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/iccsense/base.c >> @@ -305,6 +305,7 @@ nvkm_iccsense_oneinit(struct nvkm_subdev *subdev) >> rail->read = nvkm_iccsense_ina3221_read; >> break; >> default: >> + kfree(rail); >> continue; >> } >> >> -- >> 2.8.1 >> >> _______________________________________________ >> Nouveau mailing list >> Nouveau@lists.freedesktop.org >> https://lists.freedesktop.org/mailman/listinfo/nouveau