From patchwork Tue Dec 8 22:48:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Roper X-Patchwork-Id: 7802741 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 66ADCBEEE1 for ; Tue, 8 Dec 2015 22:49:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6103920411 for ; Tue, 8 Dec 2015 22:49:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id A81E1203FB for ; Tue, 8 Dec 2015 22:49:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A3A2720C7; Tue, 8 Dec 2015 14:49:01 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id 15945720C7 for ; Tue, 8 Dec 2015 14:49:01 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 08 Dec 2015 14:49:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,400,1444719600"; d="scan'208";a="869538367" Received: from mdroper-hswdev.fm.intel.com (HELO mdroper-hswdev) ([10.1.134.207]) by fmsmga002.fm.intel.com with ESMTP; 08 Dec 2015 14:49:00 -0800 Received: from mattrope by mdroper-hswdev with local (Exim 4.84) (envelope-from ) id 1a6R48-0005HN-LD; Tue, 08 Dec 2015 14:49:00 -0800 From: Matt Roper To: intel-gfx@lists.freedesktop.org Date: Tue, 8 Dec 2015 14:48:51 -0800 Message-Id: <1449614932-20258-1-git-send-email-matthew.d.roper@intel.com> X-Mailer: git-send-email 2.1.4 Subject: [Intel-gfx] [PATCH 1/2] drm/i915: Don't leak connector state on SDVO init failure X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In all of our various SDVO setup functions, we allocate an SDVO connector (along with an associated connector->state) object, then perform initialization. If that initialization fails, we need to make sure to free the state object as well as the connector. Signed-off-by: Matt Roper --- drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 06679f1..ff28867 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c @@ -2479,6 +2479,8 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) } if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { + drm_atomic_helper_connector_destroy_state(connector, + connector->state); kfree(intel_sdvo_connector); return false; } @@ -2514,6 +2516,8 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) intel_sdvo->is_tv = true; if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { + drm_atomic_helper_connector_destroy_state(connector, + connector->state); kfree(intel_sdvo_connector); return false; } @@ -2561,6 +2565,8 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) } if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { + drm_atomic_helper_connector_destroy_state(connector, + connector->state); kfree(intel_sdvo_connector); return false; } @@ -2596,6 +2602,8 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) } if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { + drm_atomic_helper_connector_destroy_state(connector, + connector->state); kfree(intel_sdvo_connector); return false; }