From owner-svn-src-stable-10@FreeBSD.ORG  Tue Apr 28 12:37:10 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B9046365;
 Tue, 28 Apr 2015 12:37:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A727A16FE;
 Tue, 28 Apr 2015 12:37:10 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3SCbAmA054891;
 Tue, 28 Apr 2015 12:37:10 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3SCbASJ054890;
 Tue, 28 Apr 2015 12:37:10 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201504281237.t3SCbASJ054890@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Tue, 28 Apr 2015 12:37:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r282141 - stable/10/sys/dev/drm2
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Apr 2015 12:37:10 -0000

Author: dumbbell
Date: Tue Apr 28 12:37:09 2015
New Revision: 282141
URL: https://svnweb.freebsd.org/changeset/base/282141

Log:
  DRM2: fix off-by-one overflow in ioctl processing
  
  Call to the driver-specific ioctl used to process ioctl number
  that will lead to the out-of-bounds access to the ioctl handler
  array.
  
  PR:             193367
  Approved by:    kib
  MFC of:		r275209 (original commit by rea)

Modified:
  stable/10/sys/dev/drm2/drm_drv.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/drm2/drm_drv.c
==============================================================================
--- stable/10/sys/dev/drm2/drm_drv.c	Tue Apr 28 12:02:24 2015	(r282140)
+++ stable/10/sys/dev/drm2/drm_drv.c	Tue Apr 28 12:37:09 2015	(r282141)
@@ -909,7 +909,7 @@ int drm_ioctl(struct cdev *kdev, u_long 
 	if (ioctl->func == NULL && nr >= DRM_COMMAND_BASE) {
 		/* The array entries begin at DRM_COMMAND_BASE ioctl nr */
 		nr -= DRM_COMMAND_BASE;
-		if (nr > dev->driver->max_ioctl) {
+		if (nr >= dev->driver->max_ioctl) {
 			DRM_DEBUG("Bad driver ioctl number, 0x%x (of 0x%x)\n",
 			    nr, dev->driver->max_ioctl);
 			return EINVAL;