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=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 79A02CA9EC5 for ; Wed, 30 Oct 2019 10:03:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 46144217F9 for ; Wed, 30 Oct 2019 10:03:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572429791; bh=0wRNsiX+/dQpBN05EOAr6sdKUyggVWB88XiAzM6Yi6U=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=DaetEKCfucYOdS/AfNNeCpESj4WEqHk/+YUklRj3E7ZHDe71R837CePncp+Sban5T XUBHB/GjHdHrYHLf6wG8qpo+bOuZMi4y3a0iZLkE6C5Fzn0LcKl9r9Oa8SRWIJSoP+ uLd7zCfaLB3kyYj/LUh7fvFWgXEuhoMfZsPH1JBc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726175AbfJ3KDI (ORCPT ); Wed, 30 Oct 2019 06:03:08 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:34025 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726032AbfJ3KDI (ORCPT ); Wed, 30 Oct 2019 06:03:08 -0400 Received: by mail-wr1-f67.google.com with SMTP id t16so1581439wrr.1; Wed, 30 Oct 2019 03:03:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=FMrNiLDlAG4LHDqZ/Yl8QilQGiUU1TiZ+I44MHl2pe8=; b=HNN3Pn/vNFFcDuiCrIDZIAg0jUIX3Ma1J5xZ3pi4cQbbPvRlhWTxNCRZL1BXGTPgBV mZPHjz9jzkrIab3DlA5QEPaVJmy/ml4Tiz+kinEe21oAK4IzLkyNrQqRwGZjY526zI03 Z5/XYQ5xvo82fUpG0b99AjLqOdTD5Hy5ATzwdglzhLO2gOMRy7HmXuhcVJ4mJ9T62sQQ IGOs35f/F3IXziTFj002YE8D8BG+FaADlIa+AjvOYNtyG4bUsls0rfgjy5xaOS3Ln+1r GdSeKJfaSlW8NXyZh1Z+dmZ6LV0170yMWq0z9sHwaV8MAjf2aN8k+utW+vHNhwTNZuSc YfSw== X-Gm-Message-State: APjAAAXTKukUTE41VU2SDz8W6jg53jemBoHMy4yFizvee+S+yDRsfMh2 5OO/oOaso980dlZW7c6YhWU= X-Google-Smtp-Source: APXvYqx9yWpySXQAETRsK0lzvhrydwfQ9Qwl8MxBphTqjmTCxz57hjMnqNjhMrjsPw6+qJUa5JnAIA== X-Received: by 2002:adf:ec4b:: with SMTP id w11mr1963541wrn.243.1572429785547; Wed, 30 Oct 2019 03:03:05 -0700 (PDT) Received: from pi (100.50.158.77.rev.sfr.net. [77.158.50.100]) by smtp.gmail.com with ESMTPSA id a11sm1768504wmh.40.2019.10.30.03.03.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Oct 2019 03:03:04 -0700 (PDT) Received: from johan by pi with local (Exim 4.92.2) (envelope-from ) id 1iPknS-0002ZQ-F2; Wed, 30 Oct 2019 11:01:46 +0100 Date: Wed, 30 Oct 2019 11:01:46 +0100 From: Johan Hovold To: Rob Clark , Sean Paul , Daniel Vetter Cc: David Airlie , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-s390@vger.kernel.org, Greg Kroah-Hartman , Johan Hovold , stable , Jordan Crouse , Harald Freudenberger , Mauro Carvalho Chehab , Fabien Dessenne Subject: Re: [PATCH 1/4] drm/msm: fix memleak on release Message-ID: <20191030100146.GC4691@localhost> References: <20191010131333.23635-1-johan@kernel.org> <20191010131333.23635-2-johan@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191010131333.23635-2-johan@kernel.org> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Thu, Oct 10, 2019 at 03:13:30PM +0200, Johan Hovold wrote: > 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 > Signed-off-by: Johan Hovold > --- Rob, Sean, Sending a reminder about this one, which is not yet in linux-next. Perhaps Daniel can pick it up otherwise? Thanks, Johan > drivers/gpu/drm/msm/msm_debugfs.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/msm/msm_debugfs.c b/drivers/gpu/drm/msm/msm_debugfs.c > index 6be879578140..1c74381a4fc9 100644 > --- a/drivers/gpu/drm/msm/msm_debugfs.c > +++ b/drivers/gpu/drm/msm/msm_debugfs.c > @@ -47,12 +47,8 @@ static int msm_gpu_release(struct inode *inode, struct file *file) > 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);