Currently DRM_IOCTL_PRIME_HANDLE_TO_FD rejects all flags except (DRM|O)_CLOEXEC making it difficult (maybe impossible) for userspace to mmap() the resulting dma-buf even when this is supported by the DRM driver. It is trivial to relax the restriction and permit read/write access. This is safe because the flags are seldom touched by drm; mostly they are passed verbatim to dma_buf calls. v3 (Tiago): removed unused flags variable from drm_prime_handle_to_fd_ioctl.
Unified · Split
| @@ -329,7 +329,7 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { · 328 unmodified lines | |||
| 329 | * drm_gem_prime_export - helper library implementation of the export callback | 329 | * drm_gem_prime_export - helper library implementation of the export callback |
| 330 | * @dev: drm_device to export from | 330 | * @dev: drm_device to export from |
| 331 | * @obj: GEM object to export | 331 | * @obj: GEM object to export |
| 332 | * @flags: flags like DRM_CLOEXEC | 332 | * @flags: flags like DRM_CLOEXEC and DRM_RDWR |
| 333 | * | 333 | * |
| 334 | * This is the implementation of the gem_prime_export functions for GEM drivers | 334 | * This is the implementation of the gem_prime_export functions for GEM drivers |
| 335 | * using the PRIME helpers. | 335 | * using the PRIME helpers. |
| @@ -628,7 +628,6 @@ int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, · 292 unmodified lines | |||
| 628 | struct drm_file *file_priv) | 628 | struct drm_file *file_priv) |
| 629 | { | 629 | { |
| 630 | struct drm_prime_handle *args = data; | 630 | struct drm_prime_handle *args = data; |
| 631 | uint32_t flags; | ||
| 632 | 631 | ||
| 633 | if (!drm_core_check_feature(dev, DRIVER_PRIME)) | 632 | if (!drm_core_check_feature(dev, DRIVER_PRIME)) |
| 634 | return -EINVAL; | 633 | return -EINVAL; |
| @@ -637,14 +636,11 @@ int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, · 2 unmodified lines | |||
| 637 | return -ENOSYS; | 636 | return -ENOSYS; |
| 638 | 637 | ||
| 639 | /* check flags are valid */ | 638 | /* check flags are valid */ |
| 640 | if (args->flags & ~DRM_CLOEXEC) | 639 | if (args->flags & ~(DRM_CLOEXEC | DRM_RDWR)) |
| 641 | return -EINVAL; | 640 | return -EINVAL; |
| 642 | 641 | ||
| 643 | /* we only want to pass DRM_CLOEXEC which is == O_CLOEXEC */ | ||
| 644 | flags = args->flags & DRM_CLOEXEC; | ||
| 645 | |||
| 646 | return dev->driver->prime_handle_to_fd(dev, file_priv, | 642 | return dev->driver->prime_handle_to_fd(dev, file_priv, |
| 647 | args->handle, flags, &args->fd); | 643 | args->handle, args->flags, &args->fd); |
| 648 | } | 644 | } |
| 649 | 645 | ||
| 650 | int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, | 646 | int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, |
| @@ -669,6 +669,7 @@ struct drm_set_client_cap { · 668 unmodified lines | |||
| 669 | __u64 value; | 669 | __u64 value; |
| 670 | }; | 670 | }; |
| 671 | 671 | ||
| 672 | #define DRM_RDWR O_RDWR | ||
| 672 | #define DRM_CLOEXEC O_CLOEXEC | 673 | #define DRM_CLOEXEC O_CLOEXEC |
| 673 | struct drm_prime_handle { | 674 | struct drm_prime_handle { |
| 674 | __u32 handle; | 675 | __u32 handle; |