Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5101020c authored by Thomas Hellstrom's avatar Thomas Hellstrom
Browse files

drm: export the DRM permission check code 



This way drm_ioctl_permit() can be used by drivers

Signed-off-by: default avatarThomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: default avatarSinclair Yeh <syeh@vmware.com>
parent 05c95018

drivers/gpu/drm/drm_ioctl.c

+2 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static int drm_version(struct drm_device *dev, void *data, 
 * indicated permissions. If so, returns zero. Otherwise returns an

 * error code suitable for ioctl return.

 */

static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)

int drm_ioctl_permit(u32 flags, struct drm_file *file_priv)

{

	/* ROOT_ONLY is only for CAP_SYS_ADMIN */

	if (unlikely((flags & DRM_ROOT_ONLY) && !capable(CAP_SYS_ADMIN)))
@@ -508,6 +508,7 @@ static int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) 


	return 0;

}

EXPORT_SYMBOL(drm_ioctl_permit);



#define DRM_IOCTL_DEF(ioctl, _func, _flags)	\

	[DRM_IOCTL_NR(ioctl)] = {		\

include/drm/drmP.h

+1 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ static inline bool drm_is_primary_client(const struct drm_file *file_priv) 
/*@{*/



				/* Driver support (drm_drv.h) */

extern int drm_ioctl_permit(u32 flags, struct drm_file *file_priv);

extern long drm_ioctl(struct file *filp,

		      unsigned int cmd, unsigned long arg);

extern long drm_compat_ioctl(struct file *filp,