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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 72AC5C43603 for ; Wed, 11 Dec 2019 15:48:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3F6AB2073D for ; Wed, 11 Dec 2019 15:48:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576079291; bh=Y5KUrfrcBxamiaLk4IFoCFyAIrttpwKkhqEjJTVEZX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1X91mkaKQUnY0lC5Gk1vjeX15dINZ8OzUTlMhRuRnDTxndey9cfhpeiFhAL6GwjLb kSyQREQ1eCmSWqmA8vXGWG/QMkqArLZbVeQC3ivqCwkdkmus7mZ4J6AmITvwHBEYOP Hbt+f7AfIEurbKTyEzGnKacQyD8VKWaJq+2uBwzA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732631AbfLKPZ1 (ORCPT ); Wed, 11 Dec 2019 10:25:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:57490 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733001AbfLKPZ0 (ORCPT ); Wed, 11 Dec 2019 10:25:26 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 71D19208C3; Wed, 11 Dec 2019 15:25:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077925; bh=Y5KUrfrcBxamiaLk4IFoCFyAIrttpwKkhqEjJTVEZX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pPKQGzm9Pw/49KPJrTPjS4aL6B1+88jIgksj1v4ZZSaODHkQZ6QhU9dsHCiu2m10M QvSK/oGGd1HV8KtECMuVnBWVznpfzq5IijK65PELihKrZFs6Bxv9vLUgp5vLW2adHE 1oQygiQShnAUrRjmxuFgL9UJU3xNzz0qWRwapN3c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jordan Crouse , Rob Clark , Johan Hovold , Sean Paul Subject: [PATCH 4.19 222/243] drm/msm: fix memleak on release Date: Wed, 11 Dec 2019 16:06:24 +0100 Message-Id: <20191211150354.316779022@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold commit a64fc11b9a520c55ca34d82e5ca32274f49b6b15 upstream. If a process is interrupted while accessing the "gpu" debugfs file and the drm device struct_mutex is contended, release() could return early and fail to free related resources. Note that the return value from release() is ignored. Fixes: 4f776f4511c7 ("drm/msm/gpu: Convert the GPU show function to use the GPU state") Cc: stable # 4.18 Cc: Jordan Crouse Cc: Rob Clark Reviewed-by: Rob Clark Signed-off-by: Johan Hovold Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20191010131333.23635-2-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/msm/msm_debugfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/drivers/gpu/drm/msm/msm_debugfs.c +++ b/drivers/gpu/drm/msm/msm_debugfs.c @@ -53,12 +53,8 @@ static int msm_gpu_release(struct inode struct msm_gpu_show_priv *show_priv = m->private; struct msm_drm_private *priv = show_priv->dev->dev_private; struct msm_gpu *gpu = priv->gpu; - int ret; - - ret = mutex_lock_interruptible(&show_priv->dev->struct_mutex); - if (ret) - return ret; + mutex_lock(&show_priv->dev->struct_mutex); gpu->funcs->gpu_state_put(show_priv->state); mutex_unlock(&show_priv->dev->struct_mutex);