* [PATCH v2] drm/lease: fix WARNING in idr_destroy
@ 2020-03-18 7:53 Qiujun Huang
2020-03-18 13:38 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Qiujun Huang @ 2020-03-18 7:53 UTC (permalink / raw)
To: daniel; +Cc: anenbupt, airlied, linux-kernel, dri-devel, Qiujun Huang
drm_lease_create takes ownership of leases. And leases will be released
by drm_master_put.
drm_master_put
->drm_master_destroy
->idr_destroy
So we needn't call idr_destroy again.
Reported-and-tested-by: syzbot+05835159fe322770fe3d@syzkaller.appspotmail.com
Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
---
drivers/gpu/drm/drm_lease.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
index b481caf..825abe3 100644
--- a/drivers/gpu/drm/drm_lease.c
+++ b/drivers/gpu/drm/drm_lease.c
@@ -542,10 +542,12 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
}
DRM_DEBUG_LEASE("Creating lease\n");
+ /* lessee will take the ownership of leases */
lessee = drm_lease_create(lessor, &leases);
if (IS_ERR(lessee)) {
ret = PTR_ERR(lessee);
+ idr_destroy(&leases);
goto out_leases;
}
@@ -580,7 +582,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
out_leases:
put_unused_fd(fd);
- idr_destroy(&leases);
DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl failed: %d\n", ret);
return ret;
--
1.8.3.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] drm/lease: fix WARNING in idr_destroy
2020-03-18 7:53 [PATCH v2] drm/lease: fix WARNING in idr_destroy Qiujun Huang
@ 2020-03-18 13:38 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2020-03-18 13:38 UTC (permalink / raw)
To: Qiujun Huang; +Cc: anenbupt, airlied, linux-kernel, dri-devel
On Wed, Mar 18, 2020 at 03:53:50PM +0800, Qiujun Huang wrote:
> drm_lease_create takes ownership of leases. And leases will be released
> by drm_master_put.
>
> drm_master_put
> ->drm_master_destroy
> ->idr_destroy
>
> So we needn't call idr_destroy again.
>
> Reported-and-tested-by: syzbot+05835159fe322770fe3d@syzkaller.appspotmail.com
> Signed-off-by: Qiujun Huang <hqjagain@gmail.com>
Thanks for the respin, and I've also seen the syzbot confirmation, so all
great.
Merged to -fixes with a cc: stable.
-Daniel
> ---
> drivers/gpu/drm/drm_lease.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c
> index b481caf..825abe3 100644
> --- a/drivers/gpu/drm/drm_lease.c
> +++ b/drivers/gpu/drm/drm_lease.c
> @@ -542,10 +542,12 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
> }
>
> DRM_DEBUG_LEASE("Creating lease\n");
> + /* lessee will take the ownership of leases */
> lessee = drm_lease_create(lessor, &leases);
>
> if (IS_ERR(lessee)) {
> ret = PTR_ERR(lessee);
> + idr_destroy(&leases);
> goto out_leases;
> }
>
> @@ -580,7 +582,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev,
>
> out_leases:
> put_unused_fd(fd);
> - idr_destroy(&leases);
>
> DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl failed: %d\n", ret);
> return ret;
> --
> 1.8.3.1
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-18 13:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-18 7:53 [PATCH v2] drm/lease: fix WARNING in idr_destroy Qiujun Huang
2020-03-18 13:38 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).