drm/lease: fix WARNING in idr_destroy
Subsystems (2)
PATCH v2 1/1 drm/lease: fix WARNING in idr_destroy
drm_lease_create takes ownership of leases. And leases will be released by drm_master_put.
drm_master_put
->drm_master_destroy
->idr_destroySo we needn't call idr_destroy again.
Reported-and-tested-by [email protected]
Signed-off-by Qiujun Huang <[email protected]>
--- drivers/gpu/drm/drm_lease.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/drm_lease.c +2 -1
@@ -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;
Signature · 1 line
1.8.3.1
Daniel Vetter
AppliedQuoted 11 lines · Qiujun Huang
drm_lease_createtakes ownership of leases. And leases will be released bydrm_master_put.
drm_master_put->drm_master_destroy ->idr_destroySo we needn't call
idr_destroyagain.Reported-and-tested-by [email protected]Signed-off-by Qiujun Huang <[email protected]>
Thanks for the respin, and I've also seen the syzbot confirmation, so all great.
Merged to -fixes with a cc: stable.
-Daniel
Quoted 32 lines
--- drivers/gpu/drm/drm_lease.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/drm_lease.c +2
-1@@ -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;Signature · 1 line
1.8.3.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel