From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26D8FC04E53 for ; Wed, 15 May 2019 11:42:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EBC322053B for ; Wed, 15 May 2019 11:42:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557920549; bh=clui04QC4t4n0r//6FAgmXuRtDJsSv/oVvcDZ/NpBYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xpqR3jrpUEpszv8ShIJBg92ETVkhF6GIkeA4vzbQz3ETfB45tmMO9MiOz59vgcISe qx4UgoiH0oi977KCk6ufLcCMjrgzexNoacng6Cmj+Eey7Eiw7yu1BJ0AKoTKydqj2H sePuzH2+quyUmrvBs7Yl62TOysat06lg6KPkwQOw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731299AbfEOLmV (ORCPT ); Wed, 15 May 2019 07:42:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:39170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726473AbfEOL2M (ORCPT ); Wed, 15 May 2019 07:28:12 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0507F20881; Wed, 15 May 2019 11:28:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557919691; bh=clui04QC4t4n0r//6FAgmXuRtDJsSv/oVvcDZ/NpBYk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vEg98YSQ3qR92SdS9BNQ7lsehbbaXJwzVaXg7bxb3y70+IxCKY3QGBWP9I4I36k/a jn9N4/rBPODeY3EqWX6WIB7XmMxNm/0NEHAHlzva6WCelJac7r9qTLd1/s4nTi3vHT jP528tCtKXxyzqy/w6lprAvnKdRyWgDcphXd3LUQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lin Yi , =?UTF-8?q?Christian=20K=C3=B6nig?= , Alex Deucher , Sasha Levin Subject: [PATCH 5.0 030/137] drm/ttm: fix dma_fence refcount imbalance on error path Date: Wed, 15 May 2019 12:55:11 +0200 Message-Id: <20190515090655.492579941@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190515090651.633556783@linuxfoundation.org> References: <20190515090651.633556783@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit 543c364d8eeeb42c0edfaac9764f4e9f3d777ec1 ] the ttm_bo_add_move_fence takes a reference to the struct dma_fence, but failed to release it on the error path, leading to a memory leak. add dma_fence_put before return when error occur. Signed-off-by: Lin Yi Reviewed-by: Christian König Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/ttm/ttm_bo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 996cadd83f244..d8e1b3f129046 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c @@ -881,8 +881,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo, reservation_object_add_shared_fence(bo->resv, fence); ret = reservation_object_reserve_shared(bo->resv, 1); - if (unlikely(ret)) + if (unlikely(ret)) { + dma_fence_put(fence); return ret; + } dma_fence_put(bo->moving); bo->moving = fence; -- 2.20.1