From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.19 13/73] drm/msm/gpu: Fix a couple memory leaks in debugfs Date: Wed, 12 Dec 2018 23:27:38 -0500 Message-ID: <20181213042838.75160-13-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, Sean Paul , freedreno@lists.freedesktop.org, Dan Carpenter List-Id: linux-arm-msm@vger.kernel.org RnJvbTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKWyBVcHN0cmVh bSBjb21taXQgNTEyNzBkZTkxNDEyYjgxOWY2NTRiODQ5ZGIzYmY5MmRhYzBhMDg1NSBdCgpUaGUg bXNtX2dwdV9vcGVuKCkgZnVuY3Rpb24gc2hvdWxkIGZyZWUgInNob3dfcHJpdiIgb24gZXJyb3Ig b3IgaXQKY2F1c2VzIHN0YXRpYyBjaGVja2VyIHdhcm5pbmdzLgoKRml4ZXM6IDRmNzc2ZjQ1MTFj NyAoImRybS9tc20vZ3B1OiBDb252ZXJ0IHRoZSBHUFUgc2hvdyBmdW5jdGlvbiB0byB1c2UgdGhl IEdQVSBzdGF0ZSIpClNpZ25lZC1vZmYtYnk6IERhbiBDYXJwZW50ZXIgPGRhbi5jYXJwZW50ZXJA b3JhY2xlLmNvbT4KU2lnbmVkLW9mZi1ieTogUm9iIENsYXJrIDxyb2JkY2xhcmtAZ21haWwuY29t PgpTaWduZWQtb2ZmLWJ5OiBTZWFuIFBhdWwgPHNlYW5wYXVsQGNocm9taXVtLm9yZz4KU2lnbmVk LW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIGRyaXZlcnMvZ3B1 L2RybS9tc20vbXNtX2RlYnVnZnMuYyB8IDE1ICsrKysrKysrKysrLS0tLQogMSBmaWxlIGNoYW5n ZWQsIDExIGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9ncHUvZHJtL21zbS9tc21fZGVidWdmcy5jIGIvZHJpdmVycy9ncHUvZHJtL21zbS9tc21fZGVi dWdmcy5jCmluZGV4IGYwZGEwZDNjOGE4MC4uZDc1NjQzNmMxZmNkIDEwMDY0NAotLS0gYS9kcml2 ZXJzL2dwdS9kcm0vbXNtL21zbV9kZWJ1Z2ZzLmMKKysrIGIvZHJpdmVycy9ncHUvZHJtL21zbS9t c21fZGVidWdmcy5jCkBAIC04NCw3ICs4NCw3IEBAIHN0YXRpYyBpbnQgbXNtX2dwdV9vcGVuKHN0 cnVjdCBpbm9kZSAqaW5vZGUsIHN0cnVjdCBmaWxlICpmaWxlKQogCiAJcmV0ID0gbXV0ZXhfbG9j a19pbnRlcnJ1cHRpYmxlKCZkZXYtPnN0cnVjdF9tdXRleCk7CiAJaWYgKHJldCkKLQkJcmV0dXJu IHJldDsKKwkJZ290byBmcmVlX3ByaXY7CiAKIAlwbV9ydW50aW1lX2dldF9zeW5jKCZncHUtPnBk ZXYtPmRldik7CiAJc2hvd19wcml2LT5zdGF0ZSA9IGdwdS0+ZnVuY3MtPmdwdV9zdGF0ZV9nZXQo Z3B1KTsKQEAgLTk0LDEzICs5NCwyMCBAQCBzdGF0aWMgaW50IG1zbV9ncHVfb3BlbihzdHJ1Y3Qg aW5vZGUgKmlub2RlLCBzdHJ1Y3QgZmlsZSAqZmlsZSkKIAogCWlmIChJU19FUlIoc2hvd19wcml2 LT5zdGF0ZSkpIHsKIAkJcmV0ID0gUFRSX0VSUihzaG93X3ByaXYtPnN0YXRlKTsKLQkJa2ZyZWUo c2hvd19wcml2KTsKLQkJcmV0dXJuIHJldDsKKwkJZ290byBmcmVlX3ByaXY7CiAJfQogCiAJc2hv d19wcml2LT5kZXYgPSBkZXY7CiAKLQlyZXR1cm4gc2luZ2xlX29wZW4oZmlsZSwgbXNtX2dwdV9z aG93LCBzaG93X3ByaXYpOworCXJldCA9IHNpbmdsZV9vcGVuKGZpbGUsIG1zbV9ncHVfc2hvdywg c2hvd19wcml2KTsKKwlpZiAocmV0KQorCQlnb3RvIGZyZWVfcHJpdjsKKworCXJldHVybiAwOwor CitmcmVlX3ByaXY6CisJa2ZyZWUoc2hvd19wcml2KTsKKwlyZXR1cm4gcmV0OwogfQogCiBzdGF0 aWMgY29uc3Qgc3RydWN0IGZpbGVfb3BlcmF0aW9ucyBtc21fZ3B1X2ZvcHMgPSB7Ci0tIAoyLjE5 LjEKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmRyaS1k ZXZlbCBtYWlsaW5nIGxpc3QKZHJpLWRldmVsQGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczov L2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2RyaS1kZXZlbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 12A3CC67839 for ; Thu, 13 Dec 2018 04:29:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C57A92087F for ; Thu, 13 Dec 2018 04:29:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675351; bh=q6EjXbBFZ7jJUEBFvP86MEQkDEGPnjuWDJ5PU9J5Z6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=K/y1Y2rNLd4aHdzqn/qDEwVKi0sskciMzAJKQq9R4tKg8xqyF6jdW5K6IRUTdYxZ7 f2+gmMpuaCNVBM7WUF+pF4Oyh5WwdJc9MiL1Wbk8ObAgFqmZdsfkG6ujwsNCm2wvuz GsFMkfRGazfBzZz+Zk/SyztJgjUzuSALDcYVa+XY= DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C57A92087F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727422AbeLME3J (ORCPT ); Wed, 12 Dec 2018 23:29:09 -0500 Received: from mail.kernel.org ([198.145.29.99]:41904 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727236AbeLME26 (ORCPT ); Wed, 12 Dec 2018 23:28:58 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1653420879; Thu, 13 Dec 2018 04:28:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544675338; bh=q6EjXbBFZ7jJUEBFvP86MEQkDEGPnjuWDJ5PU9J5Z6E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g0N5/RlgOyr/0q1jq3RuaafYEgzjMrs26R/sj99bw0MoJTBdR3r/aoRtrCJToXylL kCL+tuZHhM76ebvlTgwKT21DP0h2rj1ad377xel/hjksITZGgvgWnPKk7mnx0AvYpo KkqYqMKOtCJz80Y+OxDcmRYoj1jp6OP5UMtugN+8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dan Carpenter , Rob Clark , Sean Paul , Sasha Levin , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Subject: [PATCH AUTOSEL 4.19 13/73] drm/msm/gpu: Fix a couple memory leaks in debugfs Date: Wed, 12 Dec 2018 23:27:38 -0500 Message-Id: <20181213042838.75160-13-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181213042838.75160-1-sashal@kernel.org> References: <20181213042838.75160-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 51270de91412b819f654b849db3bf92dac0a0855 ] The msm_gpu_open() function should free "show_priv" on error or it causes static checker warnings. Fixes: 4f776f4511c7 ("drm/msm/gpu: Convert the GPU show function to use the GPU state") Signed-off-by: Dan Carpenter Signed-off-by: Rob Clark Signed-off-by: Sean Paul Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/msm_debugfs.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c index f0da0d3c8a80..d756436c1fcd 100644 --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -84,7 +84,7 @@ static int msm_gpu_open(struct inode *inode, struct file *file) ret = mutex_lock_interruptible(&dev->struct_mutex); if (ret) - return ret; + goto free_priv; pm_runtime_get_sync(&gpu->pdev->dev); show_priv->state = gpu->funcs->gpu_state_get(gpu); @@ -94,13 +94,20 @@ static int msm_gpu_open(struct inode *inode, struct file *file) if (IS_ERR(show_priv->state)) { ret = PTR_ERR(show_priv->state); - kfree(show_priv); - return ret; + goto free_priv; } show_priv->dev = dev; - return single_open(file, msm_gpu_show, show_priv); + ret = single_open(file, msm_gpu_show, show_priv); + if (ret) + goto free_priv; + + return 0; + +free_priv: + kfree(show_priv); + return ret; } static const struct file_operations msm_gpu_fops = { -- 2.19.1