From nobody Fri Dec 19 07:00:45 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCED71E61FF; Sun, 24 Mar 2024 22:53:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320839; cv=none; b=pEjW6mVTTBBoKDxIhSuPbIGd/RbvDxyM9XN2hKoZRrRxDv6Vg8SF9oTUxs558DukJ2TQuvBq9OpZXgykuTnQiqt9DVThYeCZqdyo3+y50vIAUKedoALcGG9aTqLXEamMVmFQBcBvX+Rm2Y3FuhrFcSeoyJXiZ5yZfYWJeNm9Z0s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320839; c=relaxed/simple; bh=0nT6+dnLat5eW46YYuat1egqogoXhgAReEx7/an+0Fs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UppSbODaXy78PCijEdgC2trSuxXjEJjCu0lHjA5d8Vv14V3+sN4EI73od/egLm7E55pegljyjD/KR/QXj81FQtbres/stYJ41SihBS+PGU9t+uSvpbyIDA+VxPwkMsAjIaaRm9lS19iy4JD2WDAxetETBCF2dzh7Vjp/FB7N3RU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O7Ba0mvY; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O7Ba0mvY" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25D20C433C7; Sun, 24 Mar 2024 22:53:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320838; bh=0nT6+dnLat5eW46YYuat1egqogoXhgAReEx7/an+0Fs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O7Ba0mvYpJJeFs4IiFspi0Ze5kfL5K1OxejZ9G81/F19AThiAYzyIoRRNjz4Fo1su zb7LmU0yjNT7zRAo2dg08iVDrW4wGrny0q9PqW0mwroqD5/haKvMGf7rmuCj9MLkPd cl/6j4vWYm5qYqyfOrD6CPQx2oR3w5a/be0tdLMBDCfPUQHxv7PvGVZjXunzLl9cCg Zq4+M6ixc341+i5WcGPrw1vGWgXppYIbPJieI2PgBmBPZyY39p93pqM8yvISFSTeql g8C5KsRq5QNl4fdIEWL4C2KKu7w+W6Qh50dX19UehDsCkqNIYqqfhgu//RbSndoW9p Aj8bKfsd1CFeQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Zhipeng Lu , Qiang Yu , Sasha Levin Subject: [PATCH 6.7 404/713] drm/lima: fix a memleak in lima_heap_alloc Date: Sun, 24 Mar 2024 18:42:10 -0400 Message-ID: <20240324224720.1345309-405-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324224720.1345309-1-sashal@kernel.org> References: <20240324224720.1345309-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Zhipeng Lu [ Upstream commit 04ae3eb470e52a3c41babe85ff8cee195e4dcbea ] When lima_vm_map_bo fails, the resources need to be deallocated, or there will be memleaks. Fixes: 6aebc51d7aef ("drm/lima: support heap buffer creation") Signed-off-by: Zhipeng Lu Signed-off-by: Qiang Yu Link: https://patchwork.freedesktop.org/patch/msgid/20240117071328.3811480-= 1-alexious@zju.edu.cn Signed-off-by: Sasha Levin --- drivers/gpu/drm/lima/lima_gem.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/lima/lima_gem.c b/drivers/gpu/drm/lima/lima_ge= m.c index 4f9736e5f929b..7ea244d876ca6 100644 --- a/drivers/gpu/drm/lima/lima_gem.c +++ b/drivers/gpu/drm/lima/lima_gem.c @@ -75,29 +75,34 @@ int lima_heap_alloc(struct lima_bo *bo, struct lima_vm = *vm) } else { bo->base.sgt =3D kmalloc(sizeof(*bo->base.sgt), GFP_KERNEL); if (!bo->base.sgt) { - sg_free_table(&sgt); - return -ENOMEM; + ret =3D -ENOMEM; + goto err_out0; } } =20 ret =3D dma_map_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0); - if (ret) { - sg_free_table(&sgt); - kfree(bo->base.sgt); - bo->base.sgt =3D NULL; - return ret; - } + if (ret) + goto err_out1; =20 *bo->base.sgt =3D sgt; =20 if (vm) { ret =3D lima_vm_map_bo(vm, bo, old_size >> PAGE_SHIFT); if (ret) - return ret; + goto err_out2; } =20 bo->heap_size =3D new_size; return 0; + +err_out2: + dma_unmap_sgtable(dev, &sgt, DMA_BIDIRECTIONAL, 0); +err_out1: + kfree(bo->base.sgt); + bo->base.sgt =3D NULL; +err_out0: + sg_free_table(&sgt); + return ret; } =20 int lima_gem_create_handle(struct drm_device *dev, struct drm_file *file, --=20 2.43.0