From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751291AbdBXMig (ORCPT ); Fri, 24 Feb 2017 07:38:36 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:51942 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751084AbdBXMi2 (ORCPT ); Fri, 24 Feb 2017 07:38:28 -0500 Subject: Re: [PATCH] staging: bcm2835: Fix a memory leak in error handling path To: Christophe JAILLET , mchehab@kernel.org, gregkh@linuxfoundation.org, f.fainelli@gmail.com, rjui@broadcom.com, sbranden@broadcom.com, bcm-kernel-feedback-list@broadcom.com, swarren@wwwdotorg.org, lee@kernel.org, eric@anholt.net, arnd@arndb.de References: <20170219103412.10092-1-christophe.jaillet@wanadoo.fr> Cc: devel@driverdev.osuosl.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org From: Stefan Wahren Message-ID: <6585ca42-71f4-1517-c6fc-b9ed2f23c687@i2se.com> Date: Fri, 24 Feb 2017 13:37:30 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.7.0 MIME-Version: 1.0 In-Reply-To: <20170219103412.10092-1-christophe.jaillet@wanadoo.fr> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:HOTom98znIBBvAlpizYITI44Y7XrWEKDECM4zjaiJZNqE97PR2B fI0kpdAag0fsNt7k627UUF+UR7E0DtB8amqyNOpKC8EWVBiTdf9/JQ8Lijyxanz4RYnHj78 lwgJw9/OWu4TmbmJ8VgwtCzLDiY1MXBk7R2afxStBMlxtgxTDFbqSP6gNzSKmrvxO9+pD4D VcLVrCRVUOzlm5ZFsUdOw== X-UI-Out-Filterresults: notjunk:1;V01:K0:U5+lh7+qeKA=:2HlPRFuoCebimSytcEkOre f39vDwA6gKqgQagGTwPi+ApeCmXR2u9JsI1RXfAGs4SrUHp383IXayHhpdzwbVfulZQbGZIbl B+7e3artR1TW/PsL9WUxNPSMoIe3m9ApU0pc8rc3+niXTz4R4RMj1NTjrZuPQuGj/exBvEjCP TmwlIKCuEgbdB73AQmpVQTHRoWqSQ5tj4PnuPVf/O2BpQejyTGEwIUmu5EBk5hrZ86ulx7JSt Dhefh7/QZn8tgTrg3tn36YZGx0LHLEcZlyUKWcZEQV5XHhUhVj3ps5qD2A/PMaV6tiv9bhoAV onn0L3l33QU5SKKytnZHdEaDJUM169xt7bpD5auybKx9+/1iEijXhZoiPDJJSEtBJa0Ktvd/O F9tv5CybMNt/jMYwU8aWdATOH0DFBmcN726PnWKX9VjJJUen2/1tpYEQ52FDogPIkgcW30ie3 yxd1Ov+8GLw25/f8zTqCe0zdXf9d0vzPqZA0GWYI9UcmqQmBHtIj7xBqLeAhiG1g4RZYcOPWH 3kexf7c54I09pfml2uzznc+uTybIfcSm1M7au2l/w6whRdS4IQBJUIJVSyKPLhplocTqlLdIu HJ50tCGOw8oKsxUK28k7s5m5+xRMcZyyVqo1ktTGUyrXMvjYldVVwfgTyk2NeQ+3SjM7ftbsb YA52cD3qV4r7emwyn2r4eFdbSFs3vbzqKlSmv+Oina9EIdNJcYKqWjwq9/+uMO1H1TaM3OKzj X30ni3SCqUQjoz/3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Christophe, Am 19.02.2017 um 11:34 schrieb Christophe JAILLET: > If 'kzalloc()' fails, we should release resources allocated so far, just as > done in all other cases in this function. > > Signed-off-by: Christophe JAILLET > --- > Not sure that the error handling path is correct. > Is 'gdev[0]' freed? Should it be? sorry, didn't checked your patch yet. Currently there are 3 bcm2835 drivers in staging (vchiq, camera, audio). So please resend with a more distinct subject. Thanks Stefan > --- > drivers/staging/media/platform/bcm2835/bcm2835-camera.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c b/drivers/staging/media/platform/bcm2835/bcm2835-camera.c > index ca15a698e018..9651b9bc3439 100644 > --- a/drivers/staging/media/platform/bcm2835/bcm2835-camera.c > +++ b/drivers/staging/media/platform/bcm2835/bcm2835-camera.c > @@ -1914,8 +1914,10 @@ static int __init bm2835_mmal_init(void) > > for (camera = 0; camera < num_cameras; camera++) { > dev = kzalloc(sizeof(struct bm2835_mmal_dev), GFP_KERNEL); > - if (!dev) > - return -ENOMEM; > + if (!dev) { > + ret = -ENOMEM; > + goto free_dev; > + } > > dev->camera_num = camera; > dev->max_width = resolutions[camera][0];