Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758514Ab0G3MiZ (ORCPT ); Fri, 30 Jul 2010 08:38:25 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:45324 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755895Ab0G3MiY (ORCPT ); Fri, 30 Jul 2010 08:38:24 -0400 Message-ID: <4C52C7B9.7000209@ti.com> Date: Fri, 30 Jul 2010 07:38:17 -0500 From: Nishanth Menon User-Agent: Thunderbird 2.0.0.24 (X11/20100411) MIME-Version: 1.0 To: Kulikov Vasiliy CC: "kernel-janitors@vger.kernel.org" , Greg Kroah-Hartman , "Sapiens, Rene" , Felipe Contreras , "Ramirez Luna, Omar" , "devel@driverdev.osuosl.org" , "linux-kernel@vger.kernel.org" , "linux-omap@vger.kernel.org" Subject: Re: [PATCH 7/9] staging: tidspbridge: fix memory leak References: <1280488163-20939-1-git-send-email-segooon@gmail.com> In-Reply-To: <1280488163-20939-1-git-send-email-segooon@gmail.com> Content-Type: text/plain; charset="ISO-8859-1"; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1534 Lines: 39 Kulikov Vasiliy had written, on 07/30/2010 06:09 AM, the following: > dbll_create() leaks pzl_target if target_obj is NULL. Call kzalloc() > only if memory is used. > > Signed-off-by: Kulikov Vasiliy > --- > drivers/staging/tidspbridge/pmgr/dbll.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c > index 3636aa3..86840ce 100644 > --- a/drivers/staging/tidspbridge/pmgr/dbll.c > +++ b/drivers/staging/tidspbridge/pmgr/dbll.c > @@ -247,9 +247,9 @@ int dbll_create(struct dbll_tar_obj **target_obj, > DBC_REQUIRE(pattrs != NULL); > DBC_REQUIRE(target_obj != NULL); > > - /* Allocate DBL target object */ > - pzl_target = kzalloc(sizeof(struct dbll_tar_obj), GFP_KERNEL); > if (target_obj != NULL) { > + /* Allocate DBL target object */ > + pzl_target = kzalloc(sizeof(struct dbll_tar_obj), GFP_KERNEL); > if (pzl_target == NULL) { > *target_obj = NULL; > status = -ENOMEM; I would suggest to add a else branch for if (target_obj != NULL) adding a status =-ENOMEM if error. Overall, I guess we need to kick out the DBC_REQUIRE usage.. it is misleading as it is active only when DEBUG macro is enabled! -- Regards, Nishanth Menon -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/