Commit 7693c8fe authored Mar 18, 2020 by Qiujun Huang Committed by Greg Kroah-Hartman Mar 25, 2020

drm/lease: fix WARNING in idr_destroy



commit b216a8e7908cd750550c0480cf7d2b3a37f06954 upstream.

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>
Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/1584518030-4173-1-git-send-email-hqjagain@gmail.com


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 053a9862

drivers/gpu/drm/drm_lease.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -545,10 +545,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;
		}

		@@ -583,7 +585,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;