diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2018-06-08 11:17:54 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2018-07-10 23:29:03 -0400 |
| commit | b4e7a7a88b5d060650094b8d3454bc521d669f6a (patch) | |
| tree | 296ceffb3c79d53906b23a244f432cb6ad40472a /drivers/gpu | |
| parent | 877f919e192a09e77962a13d7165783027dee5fd (diff) | |
drm_mode_create_lease_ioctl(): fix open-coded filp_clone_open()
Failure of ->open() should *not* be followed by fput(). Fixed by
using filp_clone_open(), which gets the cleanups right.
Cc: stable@vger.kernel.org
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_lease.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 50c73c0a20b9..d638c0fb3418 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c | |||
| @@ -553,24 +553,13 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, | |||
| 553 | 553 | ||
| 554 | /* Clone the lessor file to create a new file for us */ | 554 | /* Clone the lessor file to create a new file for us */ |
| 555 | DRM_DEBUG_LEASE("Allocating lease file\n"); | 555 | DRM_DEBUG_LEASE("Allocating lease file\n"); |
| 556 | path_get(&lessor_file->f_path); | 556 | lessee_file = filp_clone_open(lessor_file); |
| 557 | lessee_file = alloc_file(&lessor_file->f_path, | ||
| 558 | lessor_file->f_mode, | ||
| 559 | fops_get(lessor_file->f_inode->i_fop)); | ||
| 560 | |||
| 561 | if (IS_ERR(lessee_file)) { | 557 | if (IS_ERR(lessee_file)) { |
| 562 | ret = PTR_ERR(lessee_file); | 558 | ret = PTR_ERR(lessee_file); |
| 563 | goto out_lessee; | 559 | goto out_lessee; |
| 564 | } | 560 | } |
| 565 | 561 | ||
| 566 | /* Initialize the new file for DRM */ | ||
| 567 | DRM_DEBUG_LEASE("Initializing the file with %p\n", lessee_file->f_op->open); | ||
| 568 | ret = lessee_file->f_op->open(lessee_file->f_inode, lessee_file); | ||
| 569 | if (ret) | ||
| 570 | goto out_lessee_file; | ||
| 571 | |||
| 572 | lessee_priv = lessee_file->private_data; | 562 | lessee_priv = lessee_file->private_data; |
| 573 | |||
| 574 | /* Change the file to a master one */ | 563 | /* Change the file to a master one */ |
| 575 | drm_master_put(&lessee_priv->master); | 564 | drm_master_put(&lessee_priv->master); |
| 576 | lessee_priv->master = lessee; | 565 | lessee_priv->master = lessee; |
| @@ -588,9 +577,6 @@ int drm_mode_create_lease_ioctl(struct drm_device *dev, | |||
| 588 | DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n"); | 577 | DRM_DEBUG_LEASE("drm_mode_create_lease_ioctl succeeded\n"); |
| 589 | return 0; | 578 | return 0; |
| 590 | 579 | ||
| 591 | out_lessee_file: | ||
| 592 | fput(lessee_file); | ||
| 593 | |||
| 594 | out_lessee: | 580 | out_lessee: |
| 595 | drm_master_put(&lessee); | 581 | drm_master_put(&lessee); |
| 596 | 582 | ||
