Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp13293lfv; Tue, 12 Apr 2022 15:16:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyM8GNYNvfnPcBQ45TxkfmJ/qM6r1yNWTK9f3sDqzxwEJzzTHwurn/Y15bzYQmJ7x1CHebn X-Received: by 2002:a65:418b:0:b0:382:250b:4dda with SMTP id a11-20020a65418b000000b00382250b4ddamr33329070pgq.428.1649801791058; Tue, 12 Apr 2022 15:16:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649801791; cv=none; d=google.com; s=arc-20160816; b=YcsYX24CzvOjmYvIc8hwGkYC8DrZcFiMBrKJQhKt7HWjZ8vOMgvKcrpVcoDhoQLj6W seWvHcBHH8GZtQzxRAopQWMdX6h44pFy677nZHifdqOS8pEgI3I7FenTRSILGLlaTnq/ XrEYCxp/EdueN47HRhpjHZc5GOReQKxosXmpzuvwwqxT2Pim9aPYMQknMxqv2Ca4+DgO cN12NTm8mujZNFvzNLdwneJQAoVru0I7KtYXw/jP0UBsgbl/65Vyslzdw06zoC8yoS9p 60YC8ll2iP8rGoTQAI2zRJSVi55FsrBsFYVt33jcTr3yJBk0nDXI2O60ytohUJIsDQhe O+Ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hhrIvR09fqmM97pItAVOBYcSgOPZf5HgHjgotMwlpGc=; b=BaafOvHSss9VynFAe0wdrPmx9Ey2lQBDoz3bxekIRjHzp0p1DQHoN7iz9BO3FBwpRX q4Bhcwo/c5ZdSwb0HfgjAbcNdFSRLHEGFqMnrzR8N9S+II06P9XONbsFGK9Zb6driv5s aMK9RUKx6/NEpPZ/+ZJXGFsM81DPooE6QzsBVspCewSHgHpukJg1FmMBBywsJwV3j2sC KblQVVCTY3rVcfGeX9WpJ+SnnQU9nU4ZNsxEkOn7Hihw6BckE/gNHCxxffF51jDgx8ht Ssygsq4E7srkMShKQLKGV+/8gPeob6i5t/9SEs+LdFK3t6EwSJTqp1wUKDfncHeCq08G Em3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LVql+ot5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id s10-20020a63af4a000000b0039924bcb6a9si4022795pgo.172.2022.04.12.15.16.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 15:16:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=LVql+ot5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 944AD168D46; Tue, 12 Apr 2022 13:58:18 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349163AbiDLGfq (ORCPT + 99 others); Tue, 12 Apr 2022 02:35:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348978AbiDLGfb (ORCPT ); Tue, 12 Apr 2022 02:35:31 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6166335858; Mon, 11 Apr 2022 23:33:14 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1CC79B81B3B; Tue, 12 Apr 2022 06:33:13 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7E1D4C385A6; Tue, 12 Apr 2022 06:33:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649745191; bh=qFmFGf9o9bbW/AnGcZ49lkynddSyvevlYfY1mkVnTio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LVql+ot5tsWD1OqG/hCEBVJXQPv2ApqcxVH4ehCxKuQe8F87fe6bf+7BE0T432BHz eN5xk0mQdKhML6GKl2Duovk7AjIHGqwGXI3SmlicB98HEAFpD/fck8m/t3yPlfOXMA g/nW9Vo72szrswrxhL3yjpDnxglawY7FPIDu0/iM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Christian=20K=C3=B6nig?= , Xin Xiong , Xin Tan , Alex Deucher , Sasha Levin Subject: [PATCH 5.10 011/171] drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj Date: Tue, 12 Apr 2022 08:28:22 +0200 Message-Id: <20220412062928.209847133@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062927.870347203@linuxfoundation.org> References: <20220412062927.870347203@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xin Xiong [ Upstream commit dfced44f122c500004a48ecc8db516bb6a295a1b ] This issue takes place in an error path in amdgpu_cs_fence_to_handle_ioctl(). When `info->in.what` falls into default case, the function simply returns -EINVAL, forgetting to decrement the reference count of a dma_fence obj, which is bumped earlier by amdgpu_cs_get_fence(). This may result in reference count leaks. Fix it by decreasing the refcount of specific object before returning the error code. Reviewed-by: Christian König Signed-off-by: Xin Xiong Signed-off-by: Xin Tan Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c index 12598a4b5c78..867fcee6b0d3 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1484,6 +1484,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data, return 0; default: + dma_fence_put(fence); return -EINVAL; } } -- 2.35.1