From:   Bernard Zhao <bernard@vivo.com>
To:     Oleksandr Andrushchenko <oleksandr_andrushchenko@epam.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>,
        dri-devel@lists.freedesktop.org, xen-devel@lists.xenproject.org,
        linux-kernel@vger.kernel.org
Cc:     Bernard Zhao <bernard@vivo.com>
Subject: [PATCH] drm/xen: fix potential memleak in error branch
Date:   Sun, 14 Nov 2021 19:45:03 -0800
Message-Id: <20211115034504.4993-1-bernard@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Y+4XRGWKmtBYwDtpF/WrRip0oJbSVlKLtIFmpQoY8mXkAtq1DuheOo5ifgFg?=
 =?us-ascii?Q?60uO6fPDzyqXN3lsavI9hmgJPLBSzNzutRVsxzV1FqRrgoM764DLcYvEqF2Q?=
 =?us-ascii?Q?j41N63oUl69Ju1LIvMF8PUCDOThUCFvgl4rBpskVMjGwyJBneTnoKrrm1svT?=
 =?us-ascii?Q?09enKCp+JXN/A8ohiW3Vd4qaB4G6kEdvfhJXOcsP+U0qkhFtBfr4RyFn2Ixk?=
 =?us-ascii?Q?/xf0CSpUNPZeUizgPgs2qk9MskUtQwL+/khiuZqn55hH/w8nVfkOezPo7O8a?=
 =?us-ascii?Q?vHqBcibqfSfp28oPebVsPqHKLbJsAwTPiXHAap0vyrrOy4h5Z9EjSeOKjzgx?=
 =?us-ascii?Q?ddZFnX5wpKNf49cbdZ4kopjEivZUW3SNu2KIQXpFYuXZ81lBipmaAEdLrWdg?=
 =?us-ascii?Q?j3iBFOt743nMMxbKTme6XykIWC9UVEwykHKJX0/z6jNXSA1GIJF7H9/ild6s?=
 =?us-ascii?Q?uU8tE1dpkRcU+WU3ZNPyesT/mUMkR9/428L8r5XGu40g/juOxN9hLyydf9YO?=
 =?us-ascii?Q?4KbGXOFA6QlL2Y0+gB8VEUydxlcgISKsW6JzwbmW0kk0XNBH+ASElLtUcllP?=
 =?us-ascii?Q?yFKC30Y5dp9duWS6V209fjYhYKZ0VM/J/zcC03dpL2enj8HkkAwPzFDISlrp?=
 =?us-ascii?Q?9i7R3cfhBZpwxTUrbONFwhOjQ6VIGKhSvGATK6LhBaJ3OThvqKfq//5x3VRj?=
 =?us-ascii?Q?WimCbUyB+pi2oNvpssiKgYhEnucxPhSQGnnvatwY/NeBGTb/ingmKJcI2Hql?=
 =?us-ascii?Q?YZq6/bzTlYxLnnV3Caj4LCsxkhEgiHZppFXeOVq0DUSxSIk7GZ5zyF5g/Qlm?=
 =?us-ascii?Q?U5JMorPIMXqrllnLNNuFaixoXAl8HHVPRP6vvzJ7SZLsDKrcrfmM4JMws8gz?=
 =?us-ascii?Q?3f79Ssn/9AqjjIyCh7qTT5+o1YwcM4ldtS20z108ZJmgGhko3NXWa55DPhaz?=
 =?us-ascii?Q?G/vcYlpRgVNSWExZDXPwo9iJLGNPMTmomhx6v8bp02vM/7waQYQ9tBX5+gf6?=
 =?us-ascii?Q?tVDwbIoMWSKLZQB2O2BJFSKxW6lt035Em+pVYAyWHBgHl62Bpj9OzSLXSre+?=
 =?us-ascii?Q?FNPmVD9nj7XoIqTtWzj9A5ceDITGALZMh2IL11vVOYwU3VVDNc0sy6FR+HQe?=
 =?us-ascii?Q?mgyHJdoV+nW4PA5Xj9pFvu5oQJYHyjEZgKs2F7q7dmqGxYbti4ylej2TRNeJ?=
 =?us-ascii?Q?AVQ81NJJPxAHTTO5t8H197xFah1EZ+35pPPbJGw9byQHGcHZBfmpHj+wbKbs?=
 =?us-ascii?Q?Zz2p+zcxck+CR1iNAPZzUtSmgWLGe10m9F1CEG32jndNehm6SP68CyESzvxU?=
 =?us-ascii?Q?o430PC1wyNz7eJCEQSonbqZNPr6iNz4FDBF62tBASVeKEYyXWo5yXOQnBk0l?=
 =?us-ascii?Q?WlhXRTA8Wv228FfE1AExd2V+CjuBwl0jAXaEj/uSLJ4AXlOylDDpYsjE6c5I?=
 =?us-ascii?Q?xe1d6hn6ovyA/eMKgKmX/EPLa0YQ3+v2JGBeOA6o269BUXCx2Dbs3CDPm9RL?=
 =?us-ascii?Q?VjWQk7HpsqOiSIMTqs+ciu1DJNDlKG3sC1+v6szc8NsPZJbK5OAEl2+dP6Up?=
 =?us-ascii?Q?eCdCH0YWaDWriKgbJr4MTijibfOANgP39MecdOWLzLDAL2zcBdME8o5mcVUd?=
 =?us-ascii?Q?yQbbk6CKUf5xC6NaAdkD1is=3D?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 22c8cce4-7549-44ce-6396-08d9a7ea59d4
X-MS-Exchange-CrossTenant-AuthSource: PSAPR06MB4021.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Nov 2021 03:45:22.2575
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: C2Z64cDvLYrQC05OYDq4Lxvf27U3rbLOC0x1EDJaFp6GTKAPV7VXyndtPlTbuDcGweskFoT0liqYjCAUEFRP+Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PSAPR06MB4311
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

In function xen_drm_front_gem_import_sg_table, if in error branch,
there maybe potential memleak if not call gem_free_pages_array.

Signed-off-by: Bernard Zhao <bernard@vivo.com>
---
 drivers/gpu/drm/xen/xen_drm_front_gem.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/xen/xen_drm_front_gem.c b/drivers/gpu/drm/xen/xen_drm_front_gem.c
index b293c67230ef..732c3eec0666 100644
--- a/drivers/gpu/drm/xen/xen_drm_front_gem.c
+++ b/drivers/gpu/drm/xen/xen_drm_front_gem.c
@@ -222,15 +222,19 @@ xen_drm_front_gem_import_sg_table(struct drm_device *dev,
 
 	ret = drm_prime_sg_to_page_array(sgt, xen_obj->pages,
 					 xen_obj->num_pages);
-	if (ret < 0)
+	if (ret < 0) {
+		gem_free_pages_array(xen_obj);
 		return ERR_PTR(ret);
+	}
 
 	ret = xen_drm_front_dbuf_create(drm_info->front_info,
 					xen_drm_front_dbuf_to_cookie(&xen_obj->base),
 					0, 0, 0, size, sgt->sgl->offset,
 					xen_obj->pages);
-	if (ret < 0)
+	if (ret < 0) {
+		gem_free_pages_array(xen_obj);
 		return ERR_PTR(ret);
+	}
 
 	DRM_DEBUG("Imported buffer of size %zu with nents %u\n",
 		  size, sgt->orig_nents);
-- 
2.33.1