From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753743AbbDGNBe (ORCPT ); Tue, 7 Apr 2015 09:01:34 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:19665 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753458AbbDGNBb (ORCPT ); Tue, 7 Apr 2015 09:01:31 -0400 Date: Tue, 7 Apr 2015 16:01:11 +0300 From: Dan Carpenter To: Giedrius =?utf-8?Q?Statkevi=C4=8Dius?= Cc: lidza.louina@gmail.com, markh@compro.net, devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, driverdev-devel@linuxdriverproject.org, linux-kernel@vger.kernel.org, sudipm.mukherjee@gmail.com Subject: Re: [PATCH v2] staging: dgnc: check if kzalloc fails in dgnc_tty_init() Message-ID: <20150407130111.GE10964@mwanda> References: <1428402392-15817-1-git-send-email-giedrius.statkevicius@gmail.com> <1428410417-18524-1-git-send-email-giedrius.statkevicius@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1428410417-18524-1-git-send-email-giedrius.statkevicius@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 07, 2015 at 03:40:17PM +0300, Giedrius Statkevičius wrote: > If one of the allocations of memory for storing a channel information struct > fails then free all the successful allocations and return -ENOMEM that gets > propogated to the pci layer. Also, remove a bogus skipping in the next part of > the initiation if a previous memory allocation failed because we won't execute > that if any of the allocations failed. > > Signed-off-by: Giedrius Statkevičius > --- > v2: Only returning -ENOMEM if an allocation failed isn't enough as it was > spotted by Sudip so create a new label that frees all successfully allocated > stuff and only then returns -ENOMEM. Also, remove a unnecessary check in the > next loop. > > drivers/staging/dgnc/dgnc_tty.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c > index ce4187f..60d7e49 100644 > --- a/drivers/staging/dgnc/dgnc_tty.c > +++ b/drivers/staging/dgnc/dgnc_tty.c > @@ -316,6 +316,8 @@ int dgnc_tty_init(struct dgnc_board *brd) > * interrupt context, and there are no locks held. > */ > brd->channels[i] = kzalloc(sizeof(*brd->channels[i]), GFP_KERNEL); > + if (!brd->channels[i]) > + goto err_free_channels; The comments here say that sometimes brd->channels[] are allocated earlier. If that's true then the error handling is not correct. But I don't think it is true... Could you investigate and delete the comments and unnecessary "if (!brd->channels[i])" NULL check. regards, dan carpenter