From patchwork Thu Aug 27 08:31:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joonyoung Shim X-Patchwork-Id: 7081671 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 220EE9F372 for ; Thu, 27 Aug 2015 08:31:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C32B2099F for ; Thu, 27 Aug 2015 08:31:11 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 03A2220987 for ; Thu, 27 Aug 2015 08:31:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2EA0588DAA; Thu, 27 Aug 2015 01:31:08 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E8726ECEE for ; Thu, 27 Aug 2015 01:31:06 -0700 (PDT) Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NTQ02TGTFNSOPC0@mailout1.samsung.com> for dri-devel@lists.freedesktop.org; Thu, 27 Aug 2015 17:31:04 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.113]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 95.73.28411.8CACED55; Thu, 27 Aug 2015 17:31:04 +0900 (KST) X-AuditID: cbfee68e-f79c56d000006efb-88-55decac8fd3f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 60.EE.07062.8CACED55; Thu, 27 Aug 2015 17:31:04 +0900 (KST) Received: from localhost.localdomain ([10.252.81.123]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NTQ00BHHFNRTR10@mmp2.samsung.com>; Thu, 27 Aug 2015 17:31:04 +0900 (KST) From: Joonyoung Shim To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/exynos: fix exynos_drm_gem_prime_import_sg_table() error handling Date: Thu, 27 Aug 2015 17:31:05 +0900 Message-id: <1440664265-20641-1-git-send-email-jy0922.shim@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrILMWRmVeSWpSXmKPExsWyRsSkUPfEqXuhBlNO8Vq8/jedxeLK1/ds FpPuT2CxeHHvIovFjMkv2RxYPe53H2fy+Pj0FotH35ZVjAHMUVw2Kak5mWWpRfp2CVwZXZve MxfcZa+4+/EGYwPjWbYuRk4OCQETicYTTSwQtpjEhXvrgeJcHEICKxgltrU9Y4EpenPgPStE YhajxI7jCxkhnB+MEoeO/WEEqWIT0JO4s+04E4gtIqAs8XfiKrA4s0CqxI75X8DiwgIREhcX 3GQGsVkEVCWmdWxkB7F5BdwlVs3+CbVNTuLksclg2yQEnrNJrOtsYYRoEJD4NvkQUBEHUEJW YtMBZoh6SYmDK26wTGAUXMDIsIpRNLUguaA4Kb3ISK84Mbe4NC9dLzk/dxMjMCRP/3vWt4Px 5gHrQ4wCHIxKPLwSGfdChVgTy4orcw8xmgJtmMgsJZqcDwz8vJJ4Q2MzIwtTE1NjI3NLMyVx 3gSpn8FCAumJJanZqakFqUXxRaU5qcWHGJk4OKUaGC34j8kXzUxrLVj5XadM6PfbwGV1K6/P 2uJyaU7gmcXPGgv+r+gKZApnnbPTZ2F+rexflbb+p9P2rZvYuVHvUOkEbeOYiRNVj+ioG52o KzHf+2C29Kq9VQklzBmiJZK5T70zbTcZrlWpfL3mXfNGYc7rk/d3Ry05saraIH6D5uTivSHa f9X3vVRiKc5INNRiLipOBABZCbE2RAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRmVeSWpSXmKPExsVy+t9jQd0Tp+6FGkyYxGnx+t90FosrX9+z WUy6P4HF4sW9iywWMya/ZHNg9bjffZzJ4+PTWywefVtWMQYwRzUw2mSkJqakFimk5iXnp2Tm pdsqeQfHO8ebmhkY6hpaWpgrKeQl5qbaKrn4BOi6ZeYALVVSKEvMKQUKBSQWFyvp22GaEBri pmsB0xih6xsSBNdjZIAGEtYwZnRtes9ccJe94u7HG4wNjGfZuhg5OSQETCTeHHjPCmGLSVy4 tx4ozsUhJDCLUWLH8YWMEM4PRolDx/4wglSxCehJ3Nl2nAnEFhFQlvg7cRVYnFkgVWLH/C9g cWGBCImLC24yg9gsAqoS0zo2soPYvALuEqtm/2SB2CYncfLYZNYJjNwLGBlWMUqkFiQXFCel 5xrlpZbrFSfmFpfmpesl5+duYgSH/TPpHYyHd7kfYhTgYFTi4ZXIuBcqxJpYVlyZe4hRgoNZ SYR3/zGgEG9KYmVValF+fFFpTmrxIUZToAMmMkuJJucDYzKvJN7Q2MTMyNLI3NDCyNhcSZxX 32RTqJBAemJJanZqakFqEUwfEwenVANjyuPyPxVCr7Z+ePIhLMLjwR3D/pCrlT/Stfmy7ylZ FbMwHfpX16V6Y+vlSz3Mi6QcdnKc3u/6uGhyGO9Xs+CaGcteLnNpbIkqYw09em5SQPy879V3 grgOnTHd03BNa5op//JVrluuLr4ScFv0mt/0f4w7teZzHb/ZpBGiedNc40yBrvb1Ix4aSizF GYmGWsxFxYkAhMK/5ZECAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Cc: sw0312.kim@samsung.com, dan.carpenter@oracle.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If exynos_drm_gem_init() is failed, the result is ERR_PTR, so we should just return the result. If not, wrong porinter will be referenced from err label. Reported-by: Dan Carpenter Signed-off-by: Joonyoung Shim --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 3e4a64a..4842a31 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -569,10 +569,8 @@ exynos_drm_gem_prime_import_sg_table(struct drm_device *dev, int ret; exynos_gem_obj = exynos_drm_gem_init(dev, attach->dmabuf->size); - if (IS_ERR(exynos_gem_obj)) { - ret = PTR_ERR(exynos_gem_obj); - goto err; - } + if (IS_ERR(exynos_gem_obj)) + return exynos_gem_obj; exynos_gem_obj->dma_addr = sg_dma_address(sgt->sgl);