From owner-svn-src-head@freebsd.org  Fri Mar 11 18:59:17 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 506B3ACCD21;
 Fri, 11 Mar 2016 18:59:17 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 21945C90;
 Fri, 11 Mar 2016 18:59:17 +0000 (UTC)
 (envelope-from dumbbell@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2BIxGOI021819;
 Fri, 11 Mar 2016 18:59:16 GMT (envelope-from dumbbell@FreeBSD.org)
Received: (from dumbbell@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2BIxGLs021818;
 Fri, 11 Mar 2016 18:59:16 GMT (envelope-from dumbbell@FreeBSD.org)
Message-Id: <201603111859.u2BIxGLs021818@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dumbbell set sender to
 dumbbell@FreeBSD.org using -f
From: =?UTF-8?Q?Jean-S=c3=a9bastien_P=c3=a9dron?= <dumbbell@FreeBSD.org>
Date: Fri, 11 Mar 2016 18:59:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296674 - head/sys/dev/drm2
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 11 Mar 2016 18:59:17 -0000

Author: dumbbell
Date: Fri Mar 11 18:59:15 2016
New Revision: 296674
URL: https://svnweb.freebsd.org/changeset/base/296674

Log:
  drm: Fix dev->ioctl_count references leak
  
  This fixes the following error:
  kernel: error: [drm:pid1167:drm_release] *ERROR* Device busy: 2
  
  Because of that, drm_lastclose() was not called, leading to a few memory
  leaks once the driver was unloaded.
  
  MFC after:	1 week

Modified:
  head/sys/dev/drm2/drm_drv.c

Modified: head/sys/dev/drm2/drm_drv.c
==============================================================================
--- head/sys/dev/drm2/drm_drv.c	Fri Mar 11 17:39:54 2016	(r296673)
+++ head/sys/dev/drm2/drm_drv.c	Fri Mar 11 18:59:15 2016	(r296674)
@@ -386,17 +386,21 @@ int drm_ioctl(struct cdev *kdev, u_long 
 	switch (cmd) {
 	case FIONBIO:
 	case FIOASYNC:
+		atomic_dec(&dev->ioctl_count);
 		return 0;
 
 	case FIOSETOWN:
+		atomic_dec(&dev->ioctl_count);
 		return fsetown(*(int *)data, &file_priv->minor->buf_sigio);
 
 	case FIOGETOWN:
+		atomic_dec(&dev->ioctl_count);
 		*(int *) data = fgetown(&file_priv->minor->buf_sigio);
 		return 0;
 	}
 
 	if (IOCGROUP(cmd) != DRM_IOCTL_BASE) {
+		atomic_dec(&dev->ioctl_count);
 		DRM_DEBUG("Bad ioctl group 0x%x\n", (int)IOCGROUP(cmd));
 		return EINVAL;
 	}