From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751431AbbJAFbL (ORCPT ); Thu, 1 Oct 2015 01:31:11 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:59751 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750791AbbJAFbJ (ORCPT ); Thu, 1 Oct 2015 01:31:09 -0400 X-AuditID: cbfee691-f79d66d000001509-ce-560cc51a97d8 From: PINTU KUMAR To: "'Laura Abbott'" , "'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 Cc: me.rohit@live.com, pintu_agarwal@yahoo.com, c.rajkumar@samsung.com, sreenathd@samsung.com, cpgs@samsung.com, vishnu.ps@samsung.com References: <1443591455-14656-1-git-send-email-rohit.kr@samsung.com> <560C260C.3060000@redhat.com> In-reply-to: <560C260C.3060000@redhat.com> Subject: RE: [PATCH 1/1] staging: ion: Fix error handling in ion_buffer_create Date: Thu, 01 Oct 2015 11:01:06 +0530 Message-id: <04a501d0fc0a$85987ca0$90c975e0$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AQGpG1M9OX4EbM/opAUuP7Asuz/nngFZ2yLMnpsBddA= Content-language: en-us X-Brightmail-Tracker: H4sIAAAAAAAAA02Se0hTURzHOfee3TuHq+tN22lij1FJVqbp6qg9pD/iQGRREFFBLb1MaZpt 9qSHaOUrJR/0uPioBmqxXMwyTfOxVZo9FCw1TS1klth6Y/ZQ2lyB/30O3+/vfL8/+Elpvkmi lMYlJAn6BI1OxcigyTv0xFLlQ89tQSnVClxoNjH40/gAg7MK8ik8bF2ERyYuQlz39BeLP5bY IW7LKKPxUMp3gFONZgZfrxujcMe9QgYPisUM7upfi2+WVDF41NHL4hHLOMDvUs9AnDWYCnFr 3zcWF+T0gUgfUlVbJSEdOdkU6a+3QVIj9rEk0/GCIq876xjScuk3JA1FJpak9yRLyBd7DyTt mfvIp/qXDMm5fQOQlNY0CflmmU1E0UZt5nbIVsUIurhDgn7Zmj2y2O/DlWziY8WRhqHpyeAr nwk8pIgLRV/GTLSbZ6L2fjOTCWRSnisHyDHwmf5vyremArcgAnTW9hC6Hw6Ahi5fcipSKcP5 o0eNcteAN2ek0c0irctDc+kAWUvPUC6B52LQ4HDRJHtwASitp4t18QwuCtXUv59Mg9wCVNF1 YZLlXBgymb+ybvZCY/n90MW0c9Zc00y5eQ6qNDn+NZ2Lqp+NAHeJcPTGdppxexQo781b1lUI cUYPNNBqh+4wDo3mW6FrAcT5IUvjv39moabybngeIHFKtDglWpwSLU6JuALgDeAjJEYnGvZq 9epAgybecDBBGxi9P94CnJf1ZGIotxoMNEZYAScFKk850npu4yWaQ4aj8VagdjbKpZU+0fud x5iQtDs4ZMVyrA5VhyxfGbZCpZAv8f25lee0miRhnyAkCvrd+oM6wWAFlNRDmQzy/Ne38AHF ZfaNZZt29S7dWXo4vH1dQ8erpleRp/NWlu+5fm7DiWkvbLXWitXk1qPj8+6ql50s9Mv6yf+Z U7z915Jq/kMzE3zVdzRq/kLqjrxWAR9YdIuN8bdjlT+iTCXPx+1hx7szdHpdS2dQtqz9vvrU gWvh2V4j9+OMEf6Fbce2qKAhVhMcQOsNmr/VgkigVAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupjk+LIzCtJLcpLzFFi42I5/e+xoK7UUZ4wgw2beC3mrF/DZvH+7302 i+4pk5ksXh7StHj9bzqLxZ4zv9gt3s1/ymJxvnM5s8Wzpi+MFs2L17NZrNzzg8ni8q45bBaP Z81js7h+z95i7fxtbBbf3t5mt3i96S+jxfPmVhaL7sfNLBan7n5mt5jSd5fRQdRj2+5trB6X +3qZPO7tO8zisXPWXXaPrrdXmDzuXNvD5nFixm8Wj/1z17B7dNxqYPX4+PQWi8eFrmyP9/uu snn0bVnF6NF0qp3V4/MmOY9Zsw4zBQhENTDaZKQmpqQWKaTmJeenZOal2yp5B8c7x5uaGRjq GlpamCsp5CXmptoqufgE6Lpl5gBDQEmhLDGnFCgUkFhcrKRvh2lCaIibrgVMY4Sub0gQXI+R ARpIWMOY8eXlZvaCk+IV+5/xNzB+Eupi5OSQEDCRmHyomRHCFpO4cG89WxcjF4eQwCxGibbD R1kgnLeMEs9mzgCq4uBgE1CXOHaAF6RBRGAxs8TauekgNcwCHYwSh5a1MoEkhARSJB6/nAtm cwpoSbTfus4OYgsL+Ens3PeCGcRmEVCVWHd9GpjNK2ApsWb9J3YIW1Dix+R7LCA2M1Dv+p3H mSBseYnNa94yQ1yqILHj7GtGiCOsJB4cbmGDqBGXmPTgIfsERqFZSEbNQjJqFpJRs5C0LGBk WcUokVqQXFCclJ5rmJdarlecmFtcmpeul5yfu4kRnBafSe1gPLjL/RCjAAejEg/vgRSeMCHW xLLiytxDjBIczEoivLlbgEK8KYmVValF+fFFpTmpxYcYTYGencgsJZqcD0zZeSXxhsYm5qbG ppYmFiZmlkrivDcOMYQJCaQnlqRmp6YWpBbB9DFxcEo1MOquOGSzY2HxSa+rK+fzm12bZZ+W yxrTvXPuu/BrTNsfLnhgYuyxcXXd+vdqbNlGM4XEQteHpNtaap26P+350tgFknFL9TWUU/n7 42N3e53+9N4x2fDsBKH8T0l5D6vNpBe7u0fM7nXcpSR+2UI1rzla8M2Cj7823dRfKqvmeNT8 +K1XL2OWVyqxFGckGmoxFxUnAgCXyDDkoQMAAA== DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > -----Original Message----- > From: Laura Abbott [mailto:labbott@redhat.com] > Sent: Wednesday, September 30, 2015 11:42 PM > 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 > 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 > 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 > > > 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); > > Suggested-by: Pintu Kumar Reviewed-by: Pintu Kumar