From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:57682 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753248AbbG3TMh (ORCPT ); Thu, 30 Jul 2015 15:12:37 -0400 Subject: Patch "drm/i915: Forward all core DRM ioctls to core compat handling" has been added to the 4.1-stable tree To: tvrtko.ursulin@intel.com, daniel.vetter@ffwll.ch, daniel.vetter@intel.com, gregkh@linuxfoundation.org Cc: , From: Date: Thu, 30 Jul 2015 12:12:35 -0700 Message-ID: <14382835551846@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled drm/i915: Forward all core DRM ioctls to core compat handling to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: drm-i915-forward-all-core-drm-ioctls-to-core-compat-handling.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From ac7e7ab1c3243b10b41653cc8d8536088d83b152 Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin Date: Mon, 13 Jul 2015 16:51:39 +0100 Subject: drm/i915: Forward all core DRM ioctls to core compat handling From: Tvrtko Ursulin commit ac7e7ab1c3243b10b41653cc8d8536088d83b152 upstream. Previously only core DRM ioctls under the DRM_COMMAND_BASE were being forwarded, but the drm.h header suggests (and reality confirms) ones after (and including) DRM_COMMAND_END should be forwarded as well. We need this to correctly forward the compat ioctl for the botched-up addfb2.1 extension. Signed-off-by: Tvrtko Ursulin Cc: Daniel Vetter [danvet: Explain why this is suddenly needed and add cc: stable.] Signed-off-by: Daniel Vetter Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/i915_ioc32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/i915_ioc32.c +++ b/drivers/gpu/drm/i915/i915_ioc32.c @@ -204,7 +204,7 @@ long i915_compat_ioctl(struct file *filp drm_ioctl_compat_t *fn = NULL; int ret; - if (nr < DRM_COMMAND_BASE) + if (nr < DRM_COMMAND_BASE || nr >= DRM_COMMAND_END) return drm_compat_ioctl(filp, cmd, arg); if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls)) Patches currently in stable-queue which might be from tvrtko.ursulin@intel.com are queue-4.1/drm-provide-compat-ioctl-for-addfb2.1.patch queue-4.1/drm-i915-forward-all-core-drm-ioctls-to-core-compat-handling.patch