From nobody Thu Apr 9 13:27:13 2026 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) (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 6B0753101D0 for ; Sun, 8 Mar 2026 06:49:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772952571; cv=none; b=hqp43Bgjg6GZ6EgOeVi0ZPDCOp40Ck21W42XEwpY/1KmVB1tE2VOmNUev9KkzIlwuEJSaZqsp+jX23PE+KRa7rMVth9NNreKBSDfvPP44hHFwPZ06t5FUhk83mnqw2V92XPEdLhWrO0ShQwulqgDjFbbLPJnwqC/dz9IfMWMv8A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772952571; c=relaxed/simple; bh=/BKTkOJbNK8vWv0xzW8hwFc3TcYc2Ah5zzUcDxFOowk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=pu3kBm6+d036BCYxGuWH2mZQ3MzGzp0/CT9MvVEeE7Tr2rbBwHuU5r38SJizHo9TvOKl5eSc9uQDtD14qJlUmQAlzYW4FPSTLEgGR0+Quso8ooa5LSqM311lspeLKR5Q6T24Dt/pWvIBWqesVwFZRD9mtlq5Nmz0rFkk6SQLNfc= 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=PdbopySu; arc=none smtp.client-ip=209.85.214.180 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="PdbopySu" Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-2ae41544dcfso84564555ad.1 for ; Sat, 07 Mar 2026 22:49:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772952570; x=1773557370; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=oHZ3b8kIQa/ldmjcMemF0gGgYf2JewffGcklskFCxDY=; b=PdbopySuYtgWry5Mu8DmCfw+cmnHilQSUS6qORvibKCTv/MibXD+fp3zCkpAb8WOI/ eOHaee3kuJwC1f0nQOdeDF23VZoZyL7Jv5z7ZvRBikAHnDjgzmEE7oUAAvL9JBxzoCNw tZDKkkN9YgKDaujAWUpthjoCktYRopWF59qKOe8Ua9HbgXDlKd9HNcR6EvNt9qx3+Wow SQZg6YwvxaMXhqbtOzztOjIohMAx63v8AT9zq/+MVvDpOT3491DVXuLQAvpaiSSNE4Sn eIoIjiSd8Z+VMluw3c1SfEMu0r0x1mRHyjZTCwgA9xBG/EPSPybeGxaHtjq3cRAluDYP 7vYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772952570; x=1773557370; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oHZ3b8kIQa/ldmjcMemF0gGgYf2JewffGcklskFCxDY=; b=aywjSVQiNMPtIsfY/n0wrv9wm1bYj+39tc/jyky5TYtYBVN6ZJI79wgNVh1q6lpge3 JV8QVM77HI6Lh1DBREWMRnwH+BB/e98LWbbM2td0015k+/JgRLM+13KYEfxbcYNtl6AO TlIKmYk3RqqSn2UOKGJLcD+mLx7wnr7IbHqGUeV0pUyTDt0nbPUEJTVKgi6dHnKVZyM+ IaSNK4Ey7UiOl8yAgyU2jF29sEihf/OEwiyKpI/K200QVBKzTa0j5uJXvZJw6Il6wXvQ dzklhv2PtmG1fVPH0skomF1M65PyO8aYq8PFfHggUf9vItyS/AvuDm/xha/Z9BHBUL9s KD4A== X-Forwarded-Encrypted: i=1; AJvYcCUeEOVMGbPykt4+CsASHwxtsuBRZkkV7WCTMm2OQB5137EBGGVuYUnJ+d5zxmP4WU1Vo12ACMrhG0ggu0o=@vger.kernel.org X-Gm-Message-State: AOJu0YxinXdkKUU0nacsu7pjYFiI5qS01h29TLUDPOvWJoUjeTOg53lc AB+eadIS0bZc0t/AzaC9MR/ED/X/Ckv5NZdt5yD0DJ/8o6xEv4ejxUw6 X-Gm-Gg: ATEYQzxL13uH3j2p7VzAyFy3AaJQYIhW/LEXDGwRR9Q8KGEfBLkNIJE5vUt07VS9l/F 6ROVJitDUnONKfgy1cFlsO/tmPTC9voDAPmGxu0CNmuPAMcaPRdfSRhonnzzWr+1I6FsFySvxNR yu5LpeNhi7oJNlzyGo1gHd9gg/tgPfP48/1ENYf7Z7lN2XtFnHIcSRdDhESV7iuF9TSlvffa5J2 Bhj9Reyn1RXhqi3+f7Lh6jX8D+5JL1vsxIb+wnf6LuVNUWjENlr//fjlVpeoAJ2oiAQoJ1ZGz8m WLLQrgUURDZvptTbeMOy59S+pJHCVCgowOYMgxi89sj6HhxtiG1Dm/V7THJ1YXk33LbbFnCfbbn mtlLTD84VWccx+0q+d82KE6ois5/J47valJSfqnL9KeyleUajmsyKQpHcBa20hQ7fPUhoLDtFHZ FLcjU4O3uev9niKfJJpTVohRZkW3Tz3O5b5LGpfD5dkMcmuXQ= X-Received: by 2002:a17:903:182:b0:2ae:8077:b1c7 with SMTP id d9443c01a7336-2ae8242d3a5mr82140785ad.37.1772952569794; Sat, 07 Mar 2026 22:49:29 -0800 (PST) Received: from junjungu-PC.localdomain ([2408:820c:9009:3f2:4507:7fb4:bc3a:eca9]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ae83f8b9e4sm68061485ad.64.2026.03.07.22.49.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Mar 2026 22:49:29 -0800 (PST) From: Felix Gu Date: Sun, 08 Mar 2026 14:49:21 +0800 Subject: [PATCH] spi: amlogic-spisg: Fix memory leak in aml_spisg_probe() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260308-spisg-v1-1-2cace5cafc24@gmail.com> X-B4-Tracking: v=1; b=H4sIAPAbrWkC/6tWKk4tykwtVrJSqFYqSi3LLM7MzwNyDHUUlJIzE vPSU3UzU4B8JSMDIzMDYwMz3eKCzOJ0XVNj02TzVMsUS3MzYyWg2oKi1LTMCrA50bG1tQCt9OM RVwAAAA== X-Change-ID: 20260306-spisg-535c7e9d9763 To: Sunny Luo , Xianwei Zhao , Mark Brown Cc: linux-amlogic@lists.infradead.org, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Felix Gu X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1772952565; l=1876; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=/BKTkOJbNK8vWv0xzW8hwFc3TcYc2Ah5zzUcDxFOowk=; b=vqPfmsD3moqSuGNU//cr5LUBXukDIbjFj7/CSdRC3m4i2jFFtcz9i39Ori8w8ss8YVIkLBES7 sJ2vompmXO+AQdSJ9BACro3T5AkTRjSLiwE1/jgb9LMxnG6ea3eBrLp X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= In aml_spisg_probe(), ctlr is allocated by spi_alloc_target()/spi_alloc_host(), but fails to call spi_controller_put() in several error paths. This leads to a memory leak whenever the driver fails to probe after the initial allocation. Convert to use devm_spi_alloc_host()/devm_spi_alloc_target() to fix the memory leak. Fixes: cef9991e04ae ("spi: Add Amlogic SPISG driver") Signed-off-by: Felix Gu --- drivers/spi/spi-amlogic-spisg.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/spi/spi-amlogic-spisg.c b/drivers/spi/spi-amlogic-spis= g.c index 1509df2b17ae..9d568e385f05 100644 --- a/drivers/spi/spi-amlogic-spisg.c +++ b/drivers/spi/spi-amlogic-spisg.c @@ -729,9 +729,9 @@ static int aml_spisg_probe(struct platform_device *pdev) }; =20 if (of_property_read_bool(dev->of_node, "spi-slave")) - ctlr =3D spi_alloc_target(dev, sizeof(*spisg)); + ctlr =3D devm_spi_alloc_target(dev, sizeof(*spisg)); else - ctlr =3D spi_alloc_host(dev, sizeof(*spisg)); + ctlr =3D devm_spi_alloc_host(dev, sizeof(*spisg)); if (!ctlr) return -ENOMEM; =20 @@ -750,10 +750,8 @@ static int aml_spisg_probe(struct platform_device *pde= v) return dev_err_probe(dev, PTR_ERR(spisg->map), "regmap init failed\n"); =20 irq =3D platform_get_irq(pdev, 0); - if (irq < 0) { - ret =3D irq; - goto out_controller; - } + if (irq < 0) + return irq; =20 ret =3D device_reset_optional(dev); if (ret) @@ -817,8 +815,6 @@ static int aml_spisg_probe(struct platform_device *pdev) if (spisg->core) clk_disable_unprepare(spisg->core); clk_disable_unprepare(spisg->pclk); -out_controller: - spi_controller_put(ctlr); =20 return ret; } --- base-commit: a0ae2a256046c0c5d3778d1a194ff2e171f16e5f change-id: 20260306-spisg-535c7e9d9763 Best regards, --=20 Felix Gu