From patchwork Thu Nov 19 16:46:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7658901 Return-Path: X-Original-To: patchwork-dri-devel@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 B5CF7C05CC for ; Thu, 19 Nov 2015 16:47:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2D42C20662 for ; Thu, 19 Nov 2015 16:47:05 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 10C122065A for ; Thu, 19 Nov 2015 16:47:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6E6557A159; Thu, 19 Nov 2015 08:47:01 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by gabe.freedesktop.org (Postfix) with ESMTPS id 882E36E9DB for ; Thu, 19 Nov 2015 08:47:00 -0800 (PST) Received: by wmec201 with SMTP id c201so126154889wme.1 for ; Thu, 19 Nov 2015 08:46:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3Z4j5+WPgAMSIVLo86K7fuSC/6y+UxZviwxi9hIrt6Q=; b=EE+U9SfX+zg81Wc2Y/iRsoklmsXOViLr7epGa/E8qCDpKWdTJqMRdwAmXzb2hMcAsR 9g58MeUft1bmGMkyMPoGLmaE89WRr1NEcFgC0iimBU5MLXfNKM1XSbSwqj8ZVOomYCRq kc/uvyZX4Iq/ef/BiVbRoLxopL5egzvLhhcyo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3Z4j5+WPgAMSIVLo86K7fuSC/6y+UxZviwxi9hIrt6Q=; b=hCJAZqGh3GbsHLiT1jc2OSFejU15XARYJoj9JIxIw6HRM19sVA0992lE6s8crBc9nJ 8b2PHCgp+s3R7eNkgvgR6bwLCFJ2VWXUxXHeuQe5DL5OZRhdi42o3MhmpuXDolzWuIcI PzL2WVwg/c50DZqEbztNiVARfV6J86mz1CBb6s7kstxy3h2/QrdzKseb1x5KcWK2YbPc zeOojbTmkK2XE90301qtszTtZa1uBIpj58ZO7Big/Zqoxcwszw2s5wXFy71GjSghfADI bAju8IOk4W2d+5C44yjHzL0fddxhpyGEV9XiL+jQNKBBB9sojiJUC7PbPEcxirT7v3zp yDyA== X-Gm-Message-State: ALoCoQmGiR5t6426IVjTGU1fhO2FgfVVaXZoiCZU6Ir3zEQ+n7Sqnv1CNii2QeyazaoBeut1Cil1 X-Received: by 10.28.97.10 with SMTP id v10mr17967521wmb.66.1447951619024; Thu, 19 Nov 2015 08:46:59 -0800 (PST) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id cv3sm8695001wjc.20.2015.11.19.08.46.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Nov 2015 08:46:58 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH RESEND 01/20] drm/armada: Plug leak in dumb_map_offset Date: Thu, 19 Nov 2015 17:46:30 +0100 Message-Id: <1447951610-12622-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1447951610-12622-1-git-send-email-daniel.vetter@ffwll.ch> References: <1447951610-12622-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , Intel Graphics Development , Russell King X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,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 We need to drop the gem bo reference if it's an imported one. Cc: Russell King Signed-off-by: Daniel Vetter --- drivers/gpu/drm/armada/armada_gem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 60a688ef81c7..323da46c7ca8 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -285,7 +285,7 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, /* Don't allow imported objects to be mapped */ if (obj->obj.import_attach) { ret = -EINVAL; - goto err_unlock; + goto err_unref; } ret = drm_gem_create_mmap_offset(&obj->obj); @@ -294,6 +294,7 @@ int armada_gem_dumb_map_offset(struct drm_file *file, struct drm_device *dev, DRM_DEBUG_DRIVER("handle %#x offset %llx\n", handle, *offset); } + err_unref: drm_gem_object_unreference(&obj->obj); err_unlock: mutex_unlock(&dev->struct_mutex);