From owner-svn-src-stable@FreeBSD.ORG  Sat Feb  8 11:05:48 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94459498;
 Sat,  8 Feb 2014 11:05:48 +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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7F72611C9;
 Sat,  8 Feb 2014 11:05:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s18B5mgE041628;
 Sat, 8 Feb 2014 11:05:48 GMT (envelope-from dumbbell@svn.freebsd.org)
Received: (from dumbbell@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s18B5mP4041627;
 Sat, 8 Feb 2014 11:05:48 GMT (envelope-from dumbbell@svn.freebsd.org)
Message-Id: <201402081105.s18B5mP4041627@svn.freebsd.org>
From: Jean-Sebastien Pedron <dumbbell@FreeBSD.org>
Date: Sat, 8 Feb 2014 11:05:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r261632 - stable/9/sys/dev/drm2
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Feb 2014 11:05:48 -0000

Author: dumbbell
Date: Sat Feb  8 11:05:48 2014
New Revision: 261632
URL: http://svnweb.freebsd.org/changeset/base/261632

Log:
  MFC r254798:
  
  drm: Fix leak of connector->edid_blob_ptr

Modified:
  stable/9/sys/dev/drm2/drm_crtc.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/drm2/drm_crtc.c
==============================================================================
--- stable/9/sys/dev/drm2/drm_crtc.c	Sat Feb  8 10:57:46 2014	(r261631)
+++ stable/9/sys/dev/drm2/drm_crtc.c	Sat Feb  8 11:05:48 2014	(r261632)
@@ -170,6 +170,9 @@ static struct drm_prop_enum_list drm_enc
 	{ DRM_MODE_ENCODER_TVDAC, "TV" },
 };
 
+static void drm_property_destroy_blob(struct drm_device *dev,
+			       struct drm_property_blob *blob);
+
 char *drm_get_encoder_name(struct drm_encoder *encoder)
 {
 	static char buf[32];
@@ -520,6 +523,8 @@ void drm_connector_cleanup(struct drm_co
 		drm_mode_remove(connector, mode);
 
 	sx_xlock(&dev->mode_config.mutex);
+	if (connector->edid_blob_ptr)
+		drm_property_destroy_blob(dev, connector->edid_blob_ptr);
 	drm_mode_object_put(dev, &connector->base);
 	list_del(&connector->head);
 	dev->mode_config.num_connector--;