summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorCharles Baylis <cb-kernel@fishzet.co.uk>2021-07-16 17:43:12 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2021-07-20 15:57:43 +0200
commit3abab27c322e0f2acf981595aa8040c9164dc9fb (patch)
tree5044eea200c44d741c9f5f54b7e0fda2aef91145 /include/drm
parenta3a9ee4b5254f212c2adaa8cd8ca03bfa112f49d (diff)
downloadlinux-3abab27c322e0f2acf981595aa8040c9164dc9fb.tar.gz
linux-3abab27c322e0f2acf981595aa8040c9164dc9fb.tar.bz2
linux-3abab27c322e0f2acf981595aa8040c9164dc9fb.zip
drm: Return -ENOTTY for non-drm ioctls
drm: Return -ENOTTY for non-drm ioctls Return -ENOTTY from drm_ioctl() when userspace passes in a cmd number which doesn't relate to the drm subsystem. Glibc uses the TCGETS ioctl to implement isatty(), and without this change isatty() returns it incorrectly returns true for drm devices. To test run this command: $ if [ -t 0 ]; then echo is a tty; fi < /dev/dri/card0 which shows "is a tty" without this patch. This may also modify memory which the userspace application is not expecting. Signed-off-by: Charles Baylis <cb-kernel@fishzet.co.uk> Cc: stable@vger.kernel.org Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: https://patchwork.freedesktop.org/patch/msgid/YPG3IBlzaMhfPqCr@stando.fishzet.co.uk
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_ioctl.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drm_ioctl.h b/include/drm/drm_ioctl.h
index 10100a4bbe2a..afb27cb6a7bd 100644
--- a/include/drm/drm_ioctl.h
+++ b/include/drm/drm_ioctl.h
@@ -68,6 +68,7 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
unsigned long arg);
#define DRM_IOCTL_NR(n) _IOC_NR(n)
+#define DRM_IOCTL_TYPE(n) _IOC_TYPE(n)
#define DRM_MAJOR 226
/**