From patchwork Mon Nov 23 09:32:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 7678811 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 783D19F1D3 for ; Mon, 23 Nov 2015 09:33:39 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A30A920623 for ; Mon, 23 Nov 2015 09:33:38 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id CFE612041F for ; Mon, 23 Nov 2015 09:33:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B63C5720F1; Mon, 23 Nov 2015 01:33:31 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id B5446720E6 for ; Mon, 23 Nov 2015 01:33:24 -0800 (PST) Received: by wmww144 with SMTP id w144so96096296wmw.0 for ; Mon, 23 Nov 2015 01:33:23 -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=9Uo2dwaQn0rNjvox3pMfOkXSR2GAGwiyIr6KhYz5seM=; b=JEaJsXNwwVr7X6e+BY4rOu2fLotWuALZW3zQuxT6us1AFQG06rDc3YYDUA6jALSxIV zN8W2ndrvNXb4WoZKCmEg3ubnmLtWJJDycVFG0zRuh7IrD15w2VmZwOEQg0ALslBgwCL bBlHy3INSJTmmlu7SKZkUDnrKRxWq13VKJBlU= 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=9Uo2dwaQn0rNjvox3pMfOkXSR2GAGwiyIr6KhYz5seM=; b=CheF1dPVZDPzkNbf/A5OIKnfHTRJzzBKihmQvG6sZm9xFrNo3rmPpjVezBUUD6hZ+/ EcBp6wLs9SePYyIenSrW9feORiQmRZfw/nSp5KYDd2LU3AC0eRvXPCgGimsjKxZ00X6c f5m7tvaIZOqch+o0jpHPeTSwJoeUDE3Gd6VVSjT0Ya57O6Eoq/0zhJYDd3VVXmq2ZCQz 0UjxfLyFJ6wj6qqOE/0dXGhihN4L7erjYKjLdGxMU4GpXgI7Aqq+yg5asg3NqanMTJFk AGOdL//aBV7TgcJl3OYcsgiWwM6yU4YvrlM88Sg0Y2IfmQYVzZNd5Yfo4PTV7LOOR94c 4xQg== X-Gm-Message-State: ALoCoQl3VzAQ5b07DT+odfrs+TXNj1fm6lem/y8uvVSyuFcnaGaa8HZk6qHAwtIP7ZV17eLI42S5 X-Received: by 10.194.143.115 with SMTP id sd19mr33007888wjb.94.1448271203032; Mon, 23 Nov 2015 01:33:23 -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 pn6sm12332758wjb.15.2015.11.23.01.33.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Nov 2015 01:33:22 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/29] drm/armada: Plug leak in dumb_map_offset Date: Mon, 23 Nov 2015 10:32:43 +0100 Message-Id: <1448271183-20523-11-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.5.1 In-Reply-To: <1448271183-20523-1-git-send-email-daniel.vetter@ffwll.ch> References: <1448271183-20523-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.7 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 aaf88641bfc5..2a3ef7938f30 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);