linux-kernel - RE: [PATCH 1/1] staging: ion: Fix error handling in ion_buffer

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-id: <04a501d0fc0a$85987ca0$90c975e0$@samsung.com>
Date:	Thu, 01 Oct 2015 11:01:06 +0530
From:	PINTU KUMAR <pintu.k@...sung.com>
To:	'Laura Abbott' <labbott@...hat.com>,
	'Rohit kumar' <rohit.kr@...sung.com>,
	gregkh@...uxfoundation.org, arve@...roid.com,
	riandrews@...roid.com, dan.carpenter@...cle.com,
	sumit.semwal@...aro.org, mitchelh@...eaurora.org,
	akpm@...ux-foundation.org, linux@...musvillemoes.dk,
	dmitry.kalinkin@...il.com, elfring@...rs.sourceforge.net,
	gioh.kim@....com, devel@...verdev.osuosl.org,
	linux-kernel@...r.kernel.org
Cc:	me.rohit@...e.com, pintu_agarwal@...oo.com, c.rajkumar@...sung.com,
	sreenathd@...sung.com, cpgs@...sung.com, vishnu.ps@...sung.com
Subject: RE: [PATCH 1/1] staging: ion: Fix error handling in ion_buffer_create


> -----Original Message-----
> From: Laura Abbott [mailto:labbott@...hat.com]
> Sent: Wednesday, September 30, 2015 11:42 PM
> To: Rohit kumar; gregkh@...uxfoundation.org; arve@...roid.com;
> riandrews@...roid.com; dan.carpenter@...cle.com;
> sumit.semwal@...aro.org; mitchelh@...eaurora.org; akpm@...ux-
> foundation.org; linux@...musvillemoes.dk; dmitry.kalinkin@...il.com;
> elfring@...rs.sourceforge.net; gioh.kim@....com; devel@...verdev.osuosl.org;
> linux-kernel@...r.kernel.org
> Cc: pintu.k@...sung.com; me.rohit@...e.com; pintu_agarwal@...oo.com;
> c.rajkumar@...sung.com; sreenathd@...sung.com; cpgs@...sung.com;
> vishnu.ps@...sung.com
> Subject: Re: [PATCH 1/1] staging: ion: Fix error handling in ion_buffer_create
> 
> On 09/29/2015 10:37 PM, Rohit kumar wrote:
> > This patch fixes error handling case when buffer->pages allocation
> > fails. Also, it removes unreachable code of checking ret variable
> > although it is not updated.
> >
> 
> Reviewed-by: Laura Abbott <labbott@...hat.com>
> 
> > Signed-off-by: Rohit kumar <rohit.kr@...sung.com>
> > ---
> >   drivers/staging/android/ion/ion.c |   14 +++++---------
> >   1 file changed, 5 insertions(+), 9 deletions(-)
> >
> > diff --git a/drivers/staging/android/ion/ion.c
> > b/drivers/staging/android/ion/ion.c
> > index 217aa53..af59e4a 100644
> > --- a/drivers/staging/android/ion/ion.c
> > +++ b/drivers/staging/android/ion/ion.c
> > @@ -213,10 +213,10 @@ static struct ion_buffer *ion_buffer_create(struct
> ion_heap *heap,
> >   			"heap->ops->map_dma should return ERR_PTR on
> error"))
> >   		table = ERR_PTR(-EINVAL);
> >   	if (IS_ERR(table)) {
> > -		heap->ops->free(buffer);
> > -		kfree(buffer);
> > -		return ERR_CAST(table);
> > +		ret = -EINVAL;
> > +		goto err1;
> >   	}
> > +
> >   	buffer->sg_table = table;
> >   	if (ion_buffer_fault_user_mappings(buffer)) {
> >   		int num_pages = PAGE_ALIGN(buffer->size) / PAGE_SIZE; @@ -
> 226,7
> > +226,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
> >   		buffer->pages = vmalloc(sizeof(struct page *) * num_pages);
> >   		if (!buffer->pages) {
> >   			ret = -ENOMEM;
> > -			goto err1;
> > +			goto err;
> >   		}
> >
> >   		for_each_sg(table->sgl, sg, table->nents, i) { @@ -235,9 +235,6
> @@
> > static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
> >   			for (j = 0; j < sg->length / PAGE_SIZE; j++)
> >   				buffer->pages[k++] = page++;
> >   		}
> > -
> > -		if (ret)
> > -			goto err;
> >   	}
> >
> >   	buffer->dev = dev;
> > @@ -261,9 +258,8 @@ static struct ion_buffer *ion_buffer_create(struct
> > ion_heap *heap,
> >
> >   err:
> >   	heap->ops->unmap_dma(heap, buffer);
> > -	heap->ops->free(buffer);
> >   err1:
> > -	vfree(buffer->pages);
> > +	heap->ops->free(buffer);
> >   err2:
> >   	kfree(buffer);
> >   	return ERR_PTR(ret);
> >

Suggested-by: Pintu Kumar <pintu.k@...sung.com>
Reviewed-by: Pintu Kumar <pintu.k@...sung.com>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/