Received: by 2002:a05:6512:3d0e:0:0:0:0 with SMTP id d14csp53251lfv; Tue, 12 Apr 2022 17:00:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxR1ij3/1IaOCW3qB2WOcWgFjBt5FHbPuCAJCNxY3esj5QPQhxnyXWojfgqIc9zQ2cd80z3 X-Received: by 2002:a17:90a:4308:b0:1cb:b996:1dc with SMTP id q8-20020a17090a430800b001cbb99601dcmr7783472pjg.224.1649808058545; Tue, 12 Apr 2022 17:00:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649808058; cv=none; d=google.com; s=arc-20160816; b=ZrkQWsiBJ4llcxIDkAbgul52M1J9mcArjqAuJctZQRJBfNWqSbkE0i39zFsfdGbVm2 SYD3qq1b8wCdVpIU1s/dpAcXCStPXOvVaBKEXmiNflXN69EsKosQUr8od+AKyUhRQBr0 +yQ8GgrT4miPaTfO7HFktwyX/UP4lTKXU6zOi3MCI/OxIwTAmccWi4xb+83Tt6sTHUV2 +zxAy6SJM/ygeJLGI1lpHS/AcNlklcCx3Crha/vIaXXuysfZzXr+8jZWBellHiJs2xuq VmJbL9grQ56D4ohmvx+mk/WViZ21Ehjt6NWdJo3hLjXjr6FQxws6vwgkN6bp3MJZRKob 57PA== 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=qhECaimJx5Rv5iUCUVOivO5vr38RBqLqVOvqFIBDwiQ=; b=tAjdHObaNWnrB8Xp3sIhELYUYjxybgbDbjs2jOW5KLsFZATLvGFQg+UwDVc7ufeLtC ZOWWufn7WLW+WnIMI0oR3HZ/H3al5VLhtQ2cOnYu1y+vrF4gW2z4xkPM1qGwFWsL60Pb lCVWSDhid7iddXUsZdhglmOetnNXSjUW8sZPyYYpymx0V+i2j9aIPpHIsxdX8XLon6tU 8JNxNiDtKubJtg1VwdlUlx0kkqDNH8xFG8Y5zQTaHSV5e9RYm31eP0y7NqhJIv23cp0F WAZKu9HxKU1aOcyrhMELbF970t5JPzxDhPwNsv3YBniSDp3LAKtaC3tN0IDZjVtjAPyQ Kgqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=0mCGfmam; 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 c19-20020a170902c2d300b001570c1412cbsi12037262pla.285.2022.04.12.17.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 17:00:58 -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=0mCGfmam; 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 out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AE3566BDE1; Tue, 12 Apr 2022 14:57:19 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377583AbiDLHuj (ORCPT + 99 others); Tue, 12 Apr 2022 03:50:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58536 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343870AbiDLHWG (ORCPT ); Tue, 12 Apr 2022 03:22:06 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71AF52A730; Mon, 11 Apr 2022 23:59:41 -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 40142B81B4F; Tue, 12 Apr 2022 06:59:40 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89643C385A1; Tue, 12 Apr 2022 06:59:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746778; bh=UXOL9ozP+2qJrD/MwC8apLa02lpVVWnL6ePTyLoqf4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0mCGfmamr4y2K4Bg0BrSTlrrsQXYHPqKM+2uU99RWfq4vsOZemAkn1/u65oZCOBdP WaCubTZpNmrGPwsMUIqRUexGvXz4IlvXsn649/5YcHQE7813ixiPI+M4SJEyNmGfuH 5mmcKaobJG8C3cblVGQxkphokN0l2xe1bMpDdY6U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ohad Sharabi , Oded Gabbay , Sasha Levin Subject: [PATCH 5.16 128/285] habanalabs: fix possible memory leak in MMU DR fini Date: Tue, 12 Apr 2022 08:29:45 +0200 Message-Id: <20220412062947.360228418@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: Ohad Sharabi [ Upstream commit eb85eec858c1a5c11d3a0bff403f6440b05b40dc ] This patch fixes what seems to be copy paste error. We will have a memory leak if the host-resident shadow is NULL (which will likely happen as the DR and HR are not dependent). Signed-off-by: Ohad Sharabi Reviewed-by: Oded Gabbay Signed-off-by: Oded Gabbay Signed-off-by: Sasha Levin --- drivers/misc/habanalabs/common/mmu/mmu_v1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/misc/habanalabs/common/mmu/mmu_v1.c b/drivers/misc/habanalabs/common/mmu/mmu_v1.c index 0f536f79dd9c..e68e9f71c546 100644 --- a/drivers/misc/habanalabs/common/mmu/mmu_v1.c +++ b/drivers/misc/habanalabs/common/mmu/mmu_v1.c @@ -467,7 +467,7 @@ static void hl_mmu_v1_fini(struct hl_device *hdev) { /* MMU H/W fini was already done in device hw_fini() */ - if (!ZERO_OR_NULL_PTR(hdev->mmu_priv.hr.mmu_shadow_hop0)) { + if (!ZERO_OR_NULL_PTR(hdev->mmu_priv.dr.mmu_shadow_hop0)) { kvfree(hdev->mmu_priv.dr.mmu_shadow_hop0); gen_pool_destroy(hdev->mmu_priv.dr.mmu_pgt_pool); -- 2.35.1