From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933114AbbI3SMj (ORCPT ); Wed, 30 Sep 2015 14:12:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50697 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932994AbbI3SMe (ORCPT ); Wed, 30 Sep 2015 14:12:34 -0400 Subject: Re: [PATCH 1/1] staging: ion: Fix error handling in ion_buffer_create To: Rohit kumar , gregkh@linuxfoundation.org, arve@android.com, riandrews@android.com, dan.carpenter@oracle.com, sumit.semwal@linaro.org, mitchelh@codeaurora.org, akpm@linux-foundation.org, linux@rasmusvillemoes.dk, dmitry.kalinkin@gmail.com, elfring@users.sourceforge.net, gioh.kim@lge.com, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org References: <1443591455-14656-1-git-send-email-rohit.kr@samsung.com> Cc: pintu.k@samsung.com, me.rohit@live.com, pintu_agarwal@yahoo.com, c.rajkumar@samsung.com, sreenathd@samsung.com, cpgs@samsung.com, vishnu.ps@samsung.com From: Laura Abbott Message-ID: <560C260C.3060000@redhat.com> Date: Wed, 30 Sep 2015 11:12:28 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <1443591455-14656-1-git-send-email-rohit.kr@samsung.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > Signed-off-by: Rohit kumar > --- > 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); >