Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3EF67C433F5 for ; Sun, 9 Oct 2022 23:54:42 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AF50210E5B1; Sun, 9 Oct 2022 23:54:39 +0000 (UTC) Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8DE6710E5AB; Sun, 9 Oct 2022 23:54:32 +0000 (UTC) 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 sin.source.kernel.org (Postfix) with ESMTPS id C8D7ACE1028; Sun, 9 Oct 2022 23:54:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0723C43470; Sun, 9 Oct 2022 23:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1665359668; bh=c0nZxzjfGYuNMGZcJm+WxdQoa6sRFvDG8OlRqmeQcp8=; h=From:To:Cc:Subject:Date:From; b=bpKXRlEwu+80tbfJY86Xl/6YL4vIdrXNn6ZzLa9rbD5jlY11kzW47u0GG64BhHE0y 4LJ18VxGoJdX56p9v/k/H0V6XzI6sorb4MlUBBUFRne4hPqHZ34R71ZSe+yA/TKvS+ EYkTr+QKcjhtVOtfcOWxD1PIfVckVPhMItCO4fc03JZxxEw/yct3Ddq1S/BTAW3fHy WW2InOMvXmeU4ZYXfGEb2WRc2kbJ/f1aIaecH3i1Tzd16XZ6NmpLj9Lq2GH4VoGnmM JiQvUFOdz+CIrFV3F8y323TTGj5B0GlCUmmCe3Sv3Q2ivAnOlreMXP8Icz6/1lXFgx Yq9KncqbgZCpA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 01/25] drm/nouveau/nouveau_bo: fix potential memory leak in nouveau_bo_alloc() Date: Sun, 9 Oct 2022 19:54:01 -0400 Message-Id: <20221009235426.1231313-1-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , kherbst@redhat.com, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, bskeggs@redhat.com, Jianglei Nie Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Jianglei Nie [ Upstream commit 6dc548745d5b5102e3c53dc5097296ac270b6c69 ] nouveau_bo_alloc() allocates a memory chunk for "nvbo" with kzalloc(). When some error occurs, "nvbo" should be released. But when WARN_ON(pi < 0)) equals true, the function return ERR_PTR without releasing the "nvbo", which will lead to a memory leak. We should release the "nvbo" with kfree() if WARN_ON(pi < 0)) equals true. Signed-off-by: Jianglei Nie Signed-off-by: Lyude Paul Reviewed-by: Lyude Paul Link: https://patchwork.freedesktop.org/patch/msgid/20220705094306.2244103-1-niejianglei2021@163.com Signed-off-by: Sasha Levin --- drivers/gpu/drm/nouveau/nouveau_bo.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 511fb8dfb4c4..da58230bcb1f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c @@ -281,8 +281,10 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 domain, break; } - if (WARN_ON(pi < 0)) + if (WARN_ON(pi < 0)) { + kfree(nvbo); return ERR_PTR(-EINVAL); + } /* Disable compression if suitable settings couldn't be found. */ if (nvbo->comp && !vmm->page[pi].comp) { -- 2.35.1