From patchwork Thu Oct 15 07:36:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7403411 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 AA31EBF90C for ; Thu, 15 Oct 2015 07:33:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D359C20785 for ; Thu, 15 Oct 2015 07:33:56 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 857D5207C6 for ; Thu, 15 Oct 2015 07:33:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 38EDC7A092; Thu, 15 Oct 2015 00:33:54 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by gabe.freedesktop.org (Postfix) with ESMTPS id 226CF7A08A for ; Thu, 15 Oct 2015 00:33:52 -0700 (PDT) Received: by wicgb1 with SMTP id gb1so259834991wic.1 for ; Thu, 15 Oct 2015 00:33:50 -0700 (PDT) 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=WD7kIrsRGrpZyfpyrN3Osix+oK5WLK60xhiKQLIkzAx0Oe/LgIZk1wmG5J0eYullzg z1b6fF2uFKBnIGfClABxCgMXjZCCEk7NaKlePROqX7XEKNMtoUGGI98iVqMwHXM/Vequ 6Q2hvyOaHztBBbvdZHEq6E4/+ycCDzj+s0lG8= 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=EATIi75e9sQvOasJehxLt1OEfnyHI9bjR1RMvrxcef6+8PZmSpPnGQkR7+xq0O+BCi 6vqo9h2rC3nPkydYk0p1EUFC8TDHJzvpu0DNRN8X00QmmZ9h16+cWNWeYiVpPBJMleM8 5p78T3Z0byPYpRBf/lgYWDxfsJkTfciTw0nJlcZFaZzCWdFffVTbEl6BJzvP9rbLwmXM qdG6I5k/gAU7lILCyQf89iZKatcMSzrw0+1AKEEALZuVIXnNAteoInfIWLkOcopl9OtM GQENaUca0+eQkEC7oOAb1GCGchu5RgwkLwP4ZDp2W432N4xs8F36COihQiU84jW+D/Sn F22g== X-Gm-Message-State: ALoCoQmZfBXSJj4j9GMfK6CbD0hMRZ2L8LtANi2SFWFB41h5vGN+Zt4SNBNpDnmZ9P6R3r/CmCTr X-Received: by 10.180.8.5 with SMTP id n5mr33812747wia.94.1444894430801; Thu, 15 Oct 2015 00:33:50 -0700 (PDT) Received: from phenom.ffwll.local (212-51-149-109.fiber7.init7.net. [212.51.149.109]) by smtp.gmail.com with ESMTPSA id z4sm10201014wjz.29.2015.10.15.00.33.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Oct 2015 00:33:50 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 01/25] drm/armada: Plug leak in dumb_map_offset Date: Thu, 15 Oct 2015 09:36:17 +0200 Message-Id: <1444894601-5200-2-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> References: <1444894601-5200-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Daniel Vetter , 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.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, 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 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);