From nobody Mon Apr 6 00:12:16 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D597CC6FA8B for ; Tue, 13 Sep 2022 14:43:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233005AbiIMOnM (ORCPT ); Tue, 13 Sep 2022 10:43:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232568AbiIMOmF (ORCPT ); Tue, 13 Sep 2022 10:42:05 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D08136E2C0; Tue, 13 Sep 2022 07:22:28 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 008B0614CE; Tue, 13 Sep 2022 14:22:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05454C433D7; Tue, 13 Sep 2022 14:22:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663078922; bh=Wt1k6YYO7A7x5sNg2MQY+ULG/lmKJp3pfkgomSxsC9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tEEzYzor5yloS75NFKa2vwfnlOJCKOa+1pXF4LX1A47QbWL1RPcWX2qE5CilOjOWg DQVygdrIjMYO88fk9lK0fq/ukSCD7GbDNobrQKLBVbNxujO/5FaH+pcYOIkimJm1r/ RAPnKVMT1r72s1GQQV5yh57IyjVR9/0O7LXz0a00= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jeffy Chen , =?UTF-8?q?Christian=20K=C3=B6nig?= , Sasha Levin Subject: [PATCH 5.10 13/79] drm/gem: Fix GEM handle release errors Date: Tue, 13 Sep 2022 16:04:18 +0200 Message-Id: <20220913140350.931273909@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140350.291927556@linuxfoundation.org> References: <20220913140350.291927556@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeffy Chen [ Upstream commit ea2aa97ca37a9044ade001aef71dbc06318e8d44 ] Currently we are assuming a one to one mapping between dmabuf and GEM handle when releasing GEM handles. But that is not always true, since we would create extra handles for the GEM obj in cases like gem_open() and getfb{,2}(). A similar issue was reported at: https://lore.kernel.org/all/20211105083308.392156-1-jay.xu@rock-chips.com/ Another problem is that the imported dmabuf might not always have gem_obj->dma_buf set, which would cause leaks in drm_gem_remove_prime_handles(). Let's fix these for now by using handle to find the exact map to remove. Signed-off-by: Jeffy Chen Reviewed-by: Christian K=C3=B6nig Signed-off-by: Christian K=C3=B6nig Link: https://patchwork.freedesktop.org/patch/msgid/20220819072834.17888-1-= jeffy.chen@rock-chips.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_gem.c | 17 +---------------- drivers/gpu/drm/drm_internal.h | 4 ++-- drivers/gpu/drm/drm_prime.c | 20 ++++++++++++-------- 3 files changed, 15 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 5979af230eda0..8b30e8d83fbcf 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -166,21 +166,6 @@ void drm_gem_private_object_init(struct drm_device *de= v, } EXPORT_SYMBOL(drm_gem_private_object_init); =20 -static void -drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *= filp) -{ - /* - * Note: obj->dma_buf can't disappear as long as we still hold a - * handle reference in obj->handle_count. - */ - mutex_lock(&filp->prime.lock); - if (obj->dma_buf) { - drm_prime_remove_buf_handle_locked(&filp->prime, - obj->dma_buf); - } - mutex_unlock(&filp->prime.lock); -} - /** * drm_gem_object_handle_free - release resources bound to userspace handl= es * @obj: GEM object to clean up. @@ -254,7 +239,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *= data) else if (dev->driver->gem_close_object) dev->driver->gem_close_object(obj, file_priv); =20 - drm_gem_remove_prime_handles(obj, file_priv); + drm_prime_remove_buf_handle(&file_priv->prime, id); drm_vma_node_revoke(&obj->vma_node, file_priv); =20 drm_gem_object_handle_put_unlocked(obj); diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index b65865c630b0a..f80e0f28087d1 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h @@ -86,8 +86,8 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, = void *data, =20 void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpri= v); void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_f= priv); -void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *pri= me_fpriv, - struct dma_buf *dma_buf); +void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpri= v, + uint32_t handle); =20 /* drm_drv.c */ struct drm_minor *drm_minor_acquire(unsigned int minor_id); diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 9f955f2010c25..825499ea3ff59 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c @@ -187,29 +187,33 @@ static int drm_prime_lookup_buf_handle(struct drm_pri= me_file_private *prime_fpri return -ENOENT; } =20 -void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *pri= me_fpriv, - struct dma_buf *dma_buf) +void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpri= v, + uint32_t handle) { struct rb_node *rb; =20 - rb =3D prime_fpriv->dmabufs.rb_node; + mutex_lock(&prime_fpriv->lock); + + rb =3D prime_fpriv->handles.rb_node; while (rb) { struct drm_prime_member *member; =20 - member =3D rb_entry(rb, struct drm_prime_member, dmabuf_rb); - if (member->dma_buf =3D=3D dma_buf) { + member =3D rb_entry(rb, struct drm_prime_member, handle_rb); + if (member->handle =3D=3D handle) { rb_erase(&member->handle_rb, &prime_fpriv->handles); rb_erase(&member->dmabuf_rb, &prime_fpriv->dmabufs); =20 - dma_buf_put(dma_buf); + dma_buf_put(member->dma_buf); kfree(member); - return; - } else if (member->dma_buf < dma_buf) { + break; + } else if (member->handle < handle) { rb =3D rb->rb_right; } else { rb =3D rb->rb_left; } } + + mutex_unlock(&prime_fpriv->lock); } =20 void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpri= v) --=20 2.35.1