Received-SPF: pass (google.com: domain of code@wizofe.uk designates 185.20.209.243 as permitted sender) client-ip=185.20.209.243;
Date: Wed, 31 Oct 2018 20:58:31 +0000
From: Ioannis Valasakis <code@wizofe.uk>
To: Julia Lawall <julia.lawall@lip6.fr>
Cc: outreachy-kernel@googlegroups.com, gregkh@linuxfoundation.org,
	alexander.levin@microsoft.com
Subject: Re: [Outreachy kernel] [PATCH v2] staging: gasket Create a memory
 allocation path
Message-ID: <20181031205831.GA30408@kvasir.local>
References: <20181031164753.GA14140@kvasir.local>
 <alpine.DEB.2.21.1810312137320.2391@hadrien>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.21.1810312137320.2391@hadrien>
User-Agent: Mutt/1.10.1 (2018-07-13)

On Wed, Oct 31, 2018 at 09:40:47PM +0100, Julia Lawall wrote:
> 
> 
> On Wed, 31 Oct 2018, Ioannis Valasakis wrote:
> 
> > Fix multiple error allocation path by using re-direction.
> 
> Beside the semantic problem that has already been pointed out, I find the
> word "re-direction" a bit strange, or a bit vague.  What is redirected?
> Could it be something like "Collect the common error handling code at the
> end of the function"?
> 
> I also have the impression that this patch is on top of your previous
> incorrect patch, instead of the original code.  You should always work
> against the code in Greg's tree.
Thanks Julia. I am going to rebase on greg's staging and resend the
patch (ah fourth one!). Sorry that I am bothering all of you but in
every step I am learning something new. Thanks for being patient and
helpful!
> 
> julia
> 
> >
> > Signed-off-by: Ioannis Valasakis <code@wizofe.uk>
> > ---
> > Changes in v2:
> > 	- Specific tags for memory allocation
> > 	- Free the memory in the right way as for kfre
> >
> > drivers/staging/gasket/gasket_interrupt.c | 14 ++++++++------
> >  1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/drivers/staging/gasket/gasket_interrupt.c b/drivers/staging/gasket/gasket_interrupt.c
> > index cdfb72af1c52..23232ea8f4d9 100644
> > --- a/drivers/staging/gasket/gasket_interrupt.c
> > +++ b/drivers/staging/gasket/gasket_interrupt.c
> > @@ -348,21 +348,21 @@ int gasket_interrupt_init(struct gasket_dev *gasket_dev, const char *name,
> >  					       sizeof(struct msix_entry),
> >  					       GFP_KERNEL);
> >  	if (!interrupt_data->msix_entries) {
> > -		goto err_alloc;
> > +		goto err_free_msix;
> >  	}
> >
> >  	interrupt_data->eventfd_ctxs = kcalloc(num_interrupts,
> >  					       sizeof(struct eventfd_ctx *),
> >  					       GFP_KERNEL);
> >  	if (!interrupt_data->eventfd_ctxs) {
> > -		goto err_alloc;
> > +		goto err_free_eventfd;
> >  	}
> >
> >  	interrupt_data->interrupt_counts = kcalloc(num_interrupts,
> >  						   sizeof(ulong),
> >  						   GFP_KERNEL);
> >  	if (!interrupt_data->interrupt_counts) {
> > -		goto err_alloc;
> > +		goto err_free_data;
> >  	}
> >
> >  	switch (interrupt_data->type) {
> > @@ -397,10 +397,12 @@ int gasket_interrupt_init(struct gasket_dev *gasket_dev, const char *name,
> >
> >  	return 0;
> >
> > -err_alloc:
> > -	kfree(interrupt_data);
> > -	kfree(interrupt_data->msix_entries);
> > +err_free_msix:
> >  	kfree(interrupt_data->eventfd_ctxs);
> > +err_free_eventfd:
> > +	kfree(interrupt_data->msix_entries);
> > +err_free_data:
> > +	kfree(interrupt_data);
> >  	return -ENOMEM;
> >  }
> >
> > --
> > 2.19.1
> >
> >
> > --
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20181031164753.GA14140%40kvasir.local.
> > For more options, visit https://groups.google.com/d/optout.
> >