Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752287AbbE0DPj (ORCPT ); Tue, 26 May 2015 23:15:39 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]:34783 "EHLO mail-pd0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751428AbbE0DPh (ORCPT ); Tue, 26 May 2015 23:15:37 -0400 Message-ID: <556536D8.7070104@igel.co.jp> Date: Wed, 27 May 2015 12:15:36 +0900 From: Damian Hobson-Garcia User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Damian Hobson-Garcia , dri-devel@lists.freedesktop.org CC: robdclark@gmail.com, daniel.thompson@linaro.org, airlied@linux.ie, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 v3.18-rc4 1/4] drm: prime: Honour O_RDWR during prime-handle-to-fd References: In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2904 Lines: 77 Hello, >On Wed, Nov 12, 2014 at 6:38 AM, Daniel Thompson wrote: >> Currently DRM_IOCTL_PRIME_HANDLE_TO_FD rejects all flags except >> (DRM|O)_CLOEXEC making it hard for the userspace to generate a file >> descriptor that can be used by mmap(). >> >> It is easy to relax the restriction and allow read/write permissions. >> This should be safe because the flags are seldom touched by drm; mostly >> they are passed verbatim to dma_buf calls. >> >> Signed-off-by: Daniel Thompson > > Reviewed-by: Rob Clark It's a little bit old by now, but I'm wondering if someone call tell me whether this patch is likely to be merged sometime, or has it been (should it be?) abandoned. Thank you, Damian > >> --- >> drivers/gpu/drm/drm_prime.c | 9 +++------ >> include/uapi/drm/drm.h | 1 + >> 2 files changed, 4 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c >> index 78ca30808422..8467b17c8053 100644 >> --- a/drivers/gpu/drm/drm_prime.c >> +++ b/drivers/gpu/drm/drm_prime.c >> @@ -331,7 +331,7 @@ static const struct dma_buf_ops drm_gem_prime_dmabuf_ops = { >> * drm_gem_prime_export - helper library implemention of the export callback >> * @dev: drm_device to export from >> * @obj: GEM object to export >> - * @flags: flags like DRM_CLOEXEC >> + * @flags: flags like DRM_CLOEXEC and DRM_RDWR >> * >> * This is the implementation of the gem_prime_export functions for GEM drivers >> * using the PRIME helpers. >> @@ -635,14 +635,11 @@ int drm_prime_handle_to_fd_ioctl(struct drm_device *dev, void *data, >> return -ENOSYS; >> >> /* check flags are valid */ >> - if (args->flags & ~DRM_CLOEXEC) >> + if (args->flags & ~(DRM_CLOEXEC | DRM_RDWR)) >> return -EINVAL; >> >> - /* we only want to pass DRM_CLOEXEC which is == O_CLOEXEC */ >> - flags = args->flags & DRM_CLOEXEC; >> - >> return dev->driver->prime_handle_to_fd(dev, file_priv, >> - args->handle, flags, &args->fd); >> + args->handle, args->flags, &args->fd); >> } >> >> int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, >> diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h >> index b0b855613641..89c2b68ddc51 100644 >> --- a/include/uapi/drm/drm.h >> +++ b/include/uapi/drm/drm.h >> @@ -660,6 +660,7 @@ struct drm_set_client_cap { >> __u64 value; >> }; >> >> +#define DRM_RDWR O_RDWR >> #define DRM_CLOEXEC O_CLOEXEC >> struct drm_prime_handle { >> __u32 handle; >> -- >> 1.9.3 >> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/