From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F825369988 for ; Thu, 26 Feb 2026 11:29:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.195 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772105363; cv=none; b=tqxFVufl7tAzFcWg+AJtl1jXyVfxD+e+Zqvs4BZbaNObLwhi8He/gCpHmPdwJlrqwOPE6Twnl4FJM8TuY6cD4G7a3Ht9AheiUUfpvd0IAHbyGg2wUFYW4W4sjBTh40cSdufuwpW75WngHBh7rgsudu2CgEmzKiLDtzV4u8zj9WU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772105363; c=relaxed/simple; bh=DJ1knbSyVdyXH3Oha/SsIHld7JkMG33T8i6sZTYAcuE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Yd3+mRwHkPsde4ivfBeiij9lHsnI8jZM9GU01PbPDVRZLY+2aWPGp83hr90ltFzEwt+QQR+EifrdywnzV/GTHwD01D3GTaJeB2O1xfZU25xH4v+QMSIxDcc6foGaV5TAcSmWmeCrmuAqcOj8WmmBZiyDOI0qBP1KrM5PVdJnYY4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=D1xSMuwJ; arc=none smtp.client-ip=209.85.210.195 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D1xSMuwJ" Received: by mail-pf1-f195.google.com with SMTP id d2e1a72fcca58-8249fc726e9so487275b3a.2 for ; Thu, 26 Feb 2026 03:29:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772105362; x=1772710162; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UuLKbfj7Ral8dBvVs3O5RYWO8Xo5q7dDD99AsNljfd8=; b=D1xSMuwJhXvRyDVlcra1zbwnyZfgK/K9lLfIM87AO69ZbzuKBBPjZRXGoXjc6KGn7s s2K0uvQ2ho6N/i/0mypsI/F+oFVRHYRr4s9g78MGXldmdo+W+mSYeH+gTSe/WSy6Wvs8 7j7it1VRHwPGlCT2OOyd1TDc1XEq4N8vSa/5WdbScFINju/iitTbA9RrN1LRkaY2ZKLW A2eaXq1R+VzwGZffBYpBX4wlMesTO3wxRtrCtAyCmW0hbvPM/CWM4Kfxaw/DyepV2W1I zvEJHAXPvMk/S34nStJtgc6GhEIJFpjmbgL0bdCI7rrpfo/WNfa4bc3TLcdZ2jVSNPiz PPCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772105362; x=1772710162; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UuLKbfj7Ral8dBvVs3O5RYWO8Xo5q7dDD99AsNljfd8=; b=VGtTwHyKPzXLaxvCIJQiUkAlHcLPvttMuMqmj1sY3XvU+etMEg44k4S1NQbhSJY61w QoFT20Yq1lYxRZbZX55Nc8MkiVogY5IuNvBbkmQfZHHCunEg3V9ugiAOf95ZYN/qY4db 37FKdHXNv4MPgW5QWawMurHZlmwUQ30Ay0vvcKJZX1edQ6WOPyRgKuoyXRPvsM3DSzYj CWwbl/uur0xpGZz5EcAugK13jEdnMJrF6/mFj5YojTJgSWs/vk43jG+H44bj2iKAfZWO fRU2TBzFsKWLQKDrqsiCdlZGaQR7Lz/HZBqL6pUI/SmI34Or69jyXVpDZOv8y/qpT4ca u1FQ== X-Forwarded-Encrypted: i=1; AJvYcCVXGNkp+eHcOz84zh5PoNGnzz05Ed1FRdHKcHAfj9O8sJiOUIRnOw7qz9zMY10Bb5VPe8DYgVDV4EwBOnI=@vger.kernel.org X-Gm-Message-State: AOJu0YxkqnAIsDKA835VSq/TgN+inZfvmb1+ND+KXxAQJHht9bMorjsr MgtsPYUF6kDSgRP0ipJNnqltj5V55c838j4KZXR2Whv4bfrNtIXXE2b9 X-Gm-Gg: ATEYQzywa1nW35qAtdl2ZSjjKgJlatXCHbiN+gs7Z9NL0aqe4+HYrKER+LLxOFQMDqB WC2syWtevIGm1vQd0DXq52ucDSydX0XZDIRBSP0zGW7QJEV0yGWobvspab0Tjfj9SX8F3StLXhT mxqushCftpWX1+Md3GejmkhxVFkgwf5+VN8+vDxDxaqc31CjxeZgIChh+6x7I/IodgB29tj1rpY Rq2Vzk2kwd0kudhj74WyiT/DGLUzNjQuvkIx3Uz8qG/LpcIaCwcSbPgG0tjTI2E+2ScTq465L4N tB5C8oJLxOUwxdHkvmvfXrwMI+DyxWMwWuSQJ5VPga8pask0oIwZH5L8sr93pR8tXPQ0XRaA8/h CXzKWsu6SXVaijKWCMTkG0hY0yxLg5LcnuMXvBJDBkBFS45l2q5LCoyWSrIZL1VjkNzJk0rlLzc 8YNv9O/WH7iAyUOQkuoukxnvVSyw5mAgH68fWwD/7n/geP5YAZ0NJNQBFkfTERIZ7Zcza6Cw== X-Received: by 2002:a05:6a20:d10e:b0:394:f972:43cc with SMTP id adf61e73a8af0-395ad277f52mr3514459637.71.1772105361557; Thu, 26 Feb 2026 03:29:21 -0800 (PST) Received: from localhost.localdomain ([138.199.21.245]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c70fa8302absm2193518a12.29.2026.02.26.03.29.19 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 26 Feb 2026 03:29:21 -0800 (PST) From: Eric-Terminal To: Shubhrajyoti Datta Cc: Borislav Petkov , Tony Luck , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org, Yufan Chen Subject: [PATCH v2] EDAC/versalnet: Fix resource leaks and NULL derefs in init_versalnet() Date: Thu, 26 Feb 2026 19:29:07 +0800 Message-ID: <20260226112907.76971-1-ericterminal@gmail.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2984; i=ericterminal@gmail.com; h=from:subject; bh=8FgW5uqMUE/4Z07mbkVQn/ocK95+obGpMaQ3908c4J8=; b=owGbwMvMwCXWM/dCzeS3H+sZT6slMWQu0K5T4js6eW3Vo/s/d6fPnaX3161mAtueaOXcCTsN1 rTmpyoWd5SyMIhxMciKKbLc/b9vbq7XrTnXuQ/nwsxhZQIZwsDFKQATuVPPyLDmkzK7zoMNbAuK dI0tzJ4t6pDy4Z7/8WtIY/WZy7MWnC1jZFg8TzNQvu3m6u8JAfX1S1ftuF28d+79sl9iubfOlk/ 3ms4EAA== X-Developer-Key: i=ericterminal@gmail.com; a=openpgp; fpr=DDFFBE9D6D4ADA9CD70BC36D8C9DD07C93EDF17F Content-Transfer-Encoding: 8bit From: Yufan Chen init_versalnet() has several bugs in its error handling. kzalloc() and kmalloc() return values are used without NULL checks, causing a NULL pointer dereference when allocation fails. The cleanup loop uses while (i--) which skips the current failing index, leaking the resources already allocated for that slot. edac_mc_del_mc() is called unconditionally during unwind, even for controllers that were never registered with edac_mc_add_mc(). Also, sprintf() is used instead of snprintf() on a fixed-size buffer. Fix by adding NULL checks for dev and name allocations, replacing while (i--) with for (j = i; j >= 0; j--) to include the failing index, tracking successful edac_mc_add_mc() calls with a bool array, and switching to snprintf(). Signed-off-by: Yufan Chen Reviewed-by: Shubhrajyoti Datta --- v2: Correct Signed-off-by name and add Reviewed-by tag. Fix commit message formatting. drivers/edac/versalnet_edac.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/drivers/edac/versalnet_edac.c b/drivers/edac/versalnet_edac.c index 1a1092793..128e9cd5f 100644 --- a/drivers/edac/versalnet_edac.c +++ b/drivers/edac/versalnet_edac.c @@ -764,11 +764,12 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev) { u32 num_chans, rank, dwidth, config; struct edac_mc_layer layers[2]; + bool mc_added[NUM_CONTROLLERS] = { }; struct mem_ctl_info *mci; struct device *dev; enum dev_type dt; char *name; - int rc, i; + int rc, i, j; for (i = 0; i < NUM_CONTROLLERS; i++) { config = priv->adec[CONF + i * ADEC_NUM]; @@ -813,11 +814,25 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev) priv->dwidth = dt; dev = kzalloc(sizeof(*dev), GFP_KERNEL); + if (!dev) { + rc = -ENOMEM; + goto err_alloc; + } + dev->release = versal_edac_release; name = kmalloc(32, GFP_KERNEL); - sprintf(name, "versal-net-ddrmc5-edac-%d", i); + if (!name) { + kfree(dev); + rc = -ENOMEM; + goto err_alloc; + } + + snprintf(name, 32, "versal-net-ddrmc5-edac-%d", i); dev->init_name = name; rc = device_register(dev); + kfree(name); + if (rc) + put_device(dev); if (rc) goto err_alloc; @@ -831,21 +846,25 @@ static int init_versalnet(struct mc_priv *priv, struct platform_device *pdev) edac_printk(KERN_ERR, EDAC_MC, "Failed to register MC%d with EDAC core\n", i); goto err_alloc; } + + mc_added[i] = true; } return 0; err_alloc: - while (i--) { - mci = priv->mci[i]; + for (j = i; j >= 0; j--) { + mci = priv->mci[j]; if (!mci) continue; if (mci->pdev) { device_unregister(mci->pdev); - edac_mc_del_mc(mci->pdev); + if (mc_added[j]) + edac_mc_del_mc(mci->pdev); } edac_mc_free(mci); + priv->mci[j] = NULL; } return rc; -- 2.47.3