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 1E1F8105D98A for ; Tue, 7 Apr 2026 23:03:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9F9CC10E4DF; Tue, 7 Apr 2026 23:03:06 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LescSAKc"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6A10810E4DF for ; Tue, 7 Apr 2026 23:03:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1775602986; x=1807138986; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PmirmKjIcpOMzjHuJgaI5d43bvSHS6KkACSFD5xzLNY=; b=LescSAKcWm6xv8FxT5rrRUmxhXHJj4l3V+x0IJGbQx4lDekM89p5XCnO +8ODaiomCUFjieyIwkmOODWszbDz+KB/cZxB63inL+h9i55kVqJOA7wcL hJfM+5/3A+bG9U/uSfGZRtxZdq02SH1JaCxTDeWF37NJH4Y5IKQorX+vm ZIrlei3BBvQMq7Pyu9/DGpIMHY6KDoc9wFw3Ap8u3G0WjJN28tQOMsdrz xxU2TJqyYfLp6rjSaeXk1xTiCnSGnnIPV4XY0NsX9cSKGlwJIXEeUGV5i kigGWDDfQsM+imDC/wZe5vLllJZCFEei864pQt5fSBXj6h6Op6QaAXuAP g==; X-CSE-ConnectionGUID: fWdhX0dpSKq2xwzUs8kEJA== X-CSE-MsgGUID: wkohxjkmS1q1uFLgPIMtew== X-IronPort-AV: E=McAfee;i="6800,10657,11752"; a="76542541" X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="76542541" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2026 16:03:05 -0700 X-CSE-ConnectionGUID: h4oV0aKqROyoBCCEyl3tLA== X-CSE-MsgGUID: f68OlCj/TKCKEmPLRiJYpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.23,166,1770624000"; d="scan'208";a="232342642" Received: from shosgclin.sh.intel.com ([10.112.232.103]) by orviesa003.jf.intel.com with ESMTP; 07 Apr 2026 16:03:04 -0700 From: Shuicheng Lin To: intel-xe@lists.freedesktop.org Cc: Shuicheng Lin , Riana Tauro Subject: [PATCH 1/2] drm/xe/ras: Fix error handling in register_nodes() Date: Tue, 7 Apr 2026 22:59:12 +0000 Message-ID: <20260407225913.3397059-2-shuicheng.lin@intel.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260407225913.3397059-1-shuicheng.lin@intel.com> References: <20260407225913.3397059-1-shuicheng.lin@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Fix two issues in register_nodes(): 1. When the loop fails mid-way, previously registered nodes are not cleaned up. Add goto-based error unwinding that walks backwards through completed iterations. 2. When allocate_and_copy_counters() fails, assign_node_params() leaves ras->info[severity] as an ERR_PTR and returns. The caller then passes that ERR_PTR to kfree() via cleanup_node_param(), causing an invalid free. Fix by making assign_node_params() self-contained on error: NULL out the stale ERR_PTR and free device_name before returning. Fixes: b40db12b542f ("drm/xe/xe_drm_ras: Add support for XE DRM RAS") Cc: Riana Tauro Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Shuicheng Lin --- drivers/gpu/drm/xe/xe_drm_ras.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_drm_ras.c b/drivers/gpu/drm/xe/xe_drm_ras.c index e07dc23a155e..802e4bcb731c 100644 --- a/drivers/gpu/drm/xe/xe_drm_ras.c +++ b/drivers/gpu/drm/xe/xe_drm_ras.c @@ -73,6 +73,7 @@ static int assign_node_params(struct xe_device *xe, struct drm_ras_node *node, struct pci_dev *pdev = to_pci_dev(xe->drm.dev); struct xe_drm_ras *ras = &xe->ras; const char *device_name; + int ret; device_name = kasprintf(GFP_KERNEL, "%04x:%02x:%02x.%d", pci_domain_nr(pdev->bus), pdev->bus->number, @@ -89,8 +90,11 @@ static int assign_node_params(struct xe_device *xe, struct drm_ras_node *node, node->priv = xe; ras->info[severity] = allocate_and_copy_counters(xe); - if (IS_ERR(ras->info[severity])) - return PTR_ERR(ras->info[severity]); + if (IS_ERR(ras->info[severity])) { + ret = PTR_ERR(ras->info[severity]); + ras->info[severity] = NULL; + goto err_free_name; + } if (severity == DRM_XE_RAS_ERR_SEV_CORRECTABLE) node->query_error_counter = query_correctable_error_counter; @@ -98,6 +102,11 @@ static int assign_node_params(struct xe_device *xe, struct drm_ras_node *node, node->query_error_counter = query_uncorrectable_error_counter; return 0; + +err_free_name: + kfree(device_name); + node->device_name = NULL; + return ret; } static void cleanup_node_param(struct xe_drm_ras *ras, const enum drm_xe_ras_error_severity severity) @@ -114,26 +123,30 @@ static void cleanup_node_param(struct xe_drm_ras *ras, const enum drm_xe_ras_err static int register_nodes(struct xe_device *xe) { struct xe_drm_ras *ras = &xe->ras; - int i; + int i, ret; for_each_error_severity(i) { struct drm_ras_node *node = &ras->node[i]; - int ret; ret = assign_node_params(xe, node, i); - if (ret) { - cleanup_node_param(ras, i); - return ret; - } + if (ret) + goto err_unwind; ret = drm_ras_node_register(node); if (ret) { cleanup_node_param(ras, i); - return ret; + goto err_unwind; } } return 0; + +err_unwind: + while (i--) { + drm_ras_node_unregister(&ras->node[i]); + cleanup_node_param(ras, i); + } + return ret; } static void xe_drm_ras_unregister_nodes(struct drm_device *device, void *arg) -- 2.43.0