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

Commit 694f54f6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-misc-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 

- Mask mode type garbage from userspace (Ville)

Something went wrong on the misc tree side, but I'll pull the patch directly.

* 'drm-misc-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc:
  drm: Fix uabi regression by allowing garbage mode->type from userspace
parents 9f36f9c8 a01c4773

drivers/gpu/drm/drm_modes.c

+7 −1
Original line number Diff line number Diff line
@@ -1611,7 +1611,13 @@ int drm_mode_convert_umode(struct drm_device *dev, 
	out->vscan = in->vscan;

	out->vrefresh = in->vrefresh;

	out->flags = in->flags;

	out->type = in->type;

	/*

	 * Old xf86-video-vmware (possibly others too) used to

	 * leave 'type' unititialized. Just ignore any bits we

	 * don't like. It's a just hint after all, and more

	 * useful for the kernel->userspace direction anyway.

	 */

	out->type = in->type & DRM_MODE_TYPE_ALL;

	strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);

	out->name[DRM_DISPLAY_MODE_LEN-1] = 0;