Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp824067pxb; Tue, 12 Apr 2022 14:29:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxh8puvs3Ijyrop5BqL8aYmy9xVPBpdXmWcM/BKIr4DpNOcxDUdihFZmlI+G6oVjTahowGT X-Received: by 2002:a05:6a00:1701:b0:505:c49b:d2eb with SMTP id h1-20020a056a00170100b00505c49bd2ebmr11856660pfc.12.1649798944109; Tue, 12 Apr 2022 14:29:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649798944; cv=none; d=google.com; s=arc-20160816; b=fhXcyVoX+kud0Hc+cdxhrN3F6BnbmlgguRsrU+4unaHfNBpPSN/frgwC952pxiwKuu Pqn6oQin8WnHP8SlQjAstyzNdMyJxrKBmx8CBFf6yoRIT1q/LwcmAFdC/lBNxUyh8QR1 rkuFqyoMVgyiM9yZA4Jww8NQ5b4AH/1Qs6CDmFxrYG1oT0PQiToGX2TJTVsthCkXpWkS LPmGL82gTiUTv6S935wLh0/AcP0Bdf8D0dPWodioqdSnpU0E3HYDT3kR/YH7jRfq2kfM iBjR8KnLtAL3gnk+mZg0EscH9xF1GOTshykzLF8GIQ/hzC4/Xcqg8OQKfKT/SBHmzmC3 gEgQ== 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=I0Ji8Bq/sxDccCs8H9guHcQ6F4yKdFvnjt5Y27vran4=; b=BHLR3ZlQcR9xJsah9sRwZbN4NM+XA/ErvNs7J7bErf8T5B1ezQySxGR0PVAL4th5yI 8bwE5ZtPfMGy3BTjM5/DDl1V5SJz1zS8dCYeqn3SJCFQ/NAyiOXBSJ25z1AbB+bauK6X FxcmyQYA3MQu0wt5xJcpwBRHQeBeyUoAUfGDyoxzizkUl6aJC3p3TN7pIuWPLEP9QgE3 gjwQhKwwI5UMyIQrR7jdbib4Y9pxR9BjCgDn/0Q1d/VxMJ6wR5tiEddCLGXaGQeejN8v YMQbBvyL/LSUFslqXpURpeszGHl6xIq73AuHlSbidP/wa/oJtauAFTmrN/vS7Z5YTUcL l07g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QKGmmZgL; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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. [23.128.96.19]) by mx.google.com with ESMTPS id y20-20020a056a00181400b004fa3a8dff4esi13493556pfa.5.2022.04.12.14.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 14:29:04 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=QKGmmZgL; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 7E895117C90; Tue, 12 Apr 2022 13:40:39 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352347AbiDLHgT (ORCPT + 99 others); Tue, 12 Apr 2022 03:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352161AbiDLHNf (ORCPT ); Tue, 12 Apr 2022 03:13:35 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E2BB014027; Mon, 11 Apr 2022 23:54:23 -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 5A781B81B4E; Tue, 12 Apr 2022 06:54:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id A84ACC385A6; Tue, 12 Apr 2022 06:54:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746461; bh=nPnF8ieIoSpabq2i+hqcSSdjOkAOC5GkThjX+q/ChqA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QKGmmZgLF3+Lix5YEnPOBHmn8h0IjRXcQ++0EkBlx+HHETB6eBkiZuuzOhgLmlGN0 8G4gST7xYLT4wzawc/x3ovBSbDXyRwCvlJeeXCPInfWF4ZDYcWprh2JGWPPmWnuriD vkftY8VK21fe1NLO1Mh1BCQpfZsTRVg43r0pYzZ8= 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.16 014/285] drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj Date: Tue, 12 Apr 2022 08:27:51 +0200 Message-Id: <20220412062944.088889936@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062943.670770901@linuxfoundation.org> References: <20220412062943.670770901@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 0311d799a010..894869789041 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c @@ -1510,6 +1510,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