Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp187220pxb; Wed, 8 Sep 2021 21:30:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ5Niqw9ES5nCrFehkVCBn/aFFG3uM+kBswnQbTP4od3Z+Hj525c09LjBPnw5kgNsz0vwl X-Received: by 2002:a05:6402:6cf:: with SMTP id n15mr1114533edy.85.1631161841429; Wed, 08 Sep 2021 21:30:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631161841; cv=none; d=google.com; s=arc-20160816; b=sCcBrALEtPL1Unh9V61FDRseW2Bc1fjCGsC720MXVjpdjT+bKcwzluQfvJsaqCUrE0 3HfYhJy4+qnpNdlaWsU+pHqxd6VboJDMbfNGSQzJz1aHk9gb63KSAdnZtPk0mM9TIMqe /cf2EcTPiuixaN5qkxwXPKitCw1emNX7KaY0+JutEPEiDlrDwl9JmB9RnKqM9BuWX042 +MAkVTmqjR00SBruKtRewqZcIGRJMlCS1CeR5ExgD3gchRcU1REChDOA77mRmJqWzvJv ++WbjbF93dX8uQjm0dv1RTU5EHa2vhbaTvAXTTMeqs1MKhPX8ZHChePlM0SmHoMNywZu HG/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from :dkim-signature; bh=2doZqT3NoobKWKqgUHi+C9s95x4GgY11UNIdMKKqyxI=; b=iEeRqmomCYPMhNsHPHSzbuF4ZWv/w9zq75b0owL5di3zQWVErJFvAHHWMQWryBxQg7 Lbozlt/0aCOlrzIAgeXj9u3BsWHHV6imE0Ur4OAqFiq6rXEObic07YLd0wocCtbAw/ur ezna8NqB7mkwb4zEJSMEVgYihLXg6h86aOe4wU55irb5HG6OhU5Yc1GZqWXQ/jsWUwDh bBavO0yqhwUISZwRkrgy2TOwGbwcCi3OMZP2F5y3/bRjOJU79UZyWmduP0Klw0OMHFnI AUIv5UiiwszotwYJ9Rfs6R2PY9VA52mfS46pzcdXKb44L1Tee2YRzuNDJ1ofdOL3T8hi +Eaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=MJItkHWx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m14si692115ejl.182.2021.09.08.21.30.17; Wed, 08 Sep 2021 21:30:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@fudan.edu.cn header.s=dkim header.b=MJItkHWx; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=fudan.edu.cn Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233035AbhIIE3W (ORCPT + 99 others); Thu, 9 Sep 2021 00:29:22 -0400 Received: from zg8tmty1ljiyny4xntqumjca.icoremail.net ([165.227.154.27]:36318 "HELO zg8tmty1ljiyny4xntqumjca.icoremail.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1350388AbhIIE3R (ORCPT ); Thu, 9 Sep 2021 00:29:17 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fudan.edu.cn; s=dkim; h=Received:From:To:Cc:Subject:Date: Message-Id; bh=2doZqT3NoobKWKqgUHi+C9s95x4GgY11UNIdMKKqyxI=; b=M JItkHWxqVxjpc/sUtCuq9lkntR7rs96kds+MPnXUyuyj7SVYauqRT80DmB8OQmxs VS8hsf5srTxOS+/2dEA0MpfY9UTFVjhRpkKVT8fKfo0Rfu36z4Vl5JsIeWcdq2Hr hgayVXynrxxJ/GljFGajmb4IM+eRwqBptxjO8/fY7U= Received: from localhost.localdomain (unknown [10.162.127.118]) by app1 (Coremail) with SMTP id XAUFCgBXX18+jTlh3nQ9AA--.1062S3; Thu, 09 Sep 2021 12:27:42 +0800 (CST) From: Xiyu Yang To: Felix Kuehling , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , "Pan, Xinhui" , David Airlie , Daniel Vetter , amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: yuanxzhang@fudan.edu.cn, Xiyu Yang , Xin Xiong , Xin Tan Subject: [PATCH] drm/amd/amdkfd: fix possible memory leak in svm_range_restore_pages Date: Thu, 9 Sep 2021 12:27:39 +0800 Message-Id: <1631161659-76719-1-git-send-email-xiyuyang19@fudan.edu.cn> X-Mailer: git-send-email 2.7.4 X-CM-TRANSID: XAUFCgBXX18+jTlh3nQ9AA--.1062S3 X-Coremail-Antispam: 1UD129KBjvdXoWruF1DZr1Utr13tFW8Ar4ruFg_yoWkArc_G3 48X3s3Zr42yF1kZF42vw4rZF929r1UAF4kWw1vqa4rtryavrW5W345Xrn3Xr15ursruFsr Aan8Wr4Sy3sxCjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbTkFF20E14v26r4j6ryUM7CY07I20VC2zVCF04k26cxKx2IYs7xG 6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8w A2z4x0Y4vE2Ix0cI8IcVAFwI0_tr0E3s1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Gr1j 6F4UJwA2z4x0Y4vEx4A2jsIE14v26rxl6s0DM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IE rcIFxwACI402YVCY1x02628vn2kIc2xKxwCY02Avz4vE-syl42xK82IYc2Ij64vIr41l4I 8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AK xVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcV AFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8I cIk0rVWrZr1j6s0DMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI 0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x0JUQZ23UUUUU= X-CM-SenderInfo: irzsiiysuqikmy6i3vldqovvfxof0/ Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The memory leak issue may take place in an error handling path. When p->xnack_enabled is NULL, the function simply returns with -EFAULT and forgets to decrement the reference count of a kfd_process object bumped by kfd_lookup_process_by_pasid, which may incur memory leaks. Fix it by jumping to label "out", in which kfd_unref_process() decreases the refcount. Signed-off-by: Xiyu Yang Signed-off-by: Xin Xiong Signed-off-by: Xin Tan --- drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c index e883731c3f8f..0f7f1e5621ea 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_svm.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_svm.c @@ -2426,7 +2426,8 @@ svm_range_restore_pages(struct amdgpu_device *adev, unsigned int pasid, } if (!p->xnack_enabled) { pr_debug("XNACK not enabled for pasid 0x%x\n", pasid); - return -EFAULT; + r = -EFAULT; + goto out; } svms = &p->svms; -- 2.7.4