From nobody Mon Apr 6 16:28:11 2026 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 C33123128B6 for ; Wed, 18 Mar 2026 16:12:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773850365; cv=none; b=MZIXfESkwp1KWRwDivSLcekjyYX5R3UMoSRJSd8jVQOPEu5KaeasOu7H3RNxZ4cmpmvFQ6+QF3XTOPJUtiwlp6lnymJIBrmClnxpcd+y/BnHYwxcCMTfDiTUIk+7MuP0fbyrm8fVW7HKVOirsn7wKtAr3ynzvU+d4KSdGCGBJ68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773850365; c=relaxed/simple; bh=v9woLIZgnstGAIF0Eth5tsY4n3LQFLhcy4LkO8NqurM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=di/d0JZG2ZdhDuB7Bw2iBdUN5RewCLtAgZFY5/FweWb7JTB3OzJSeez8i44OIjKCZgmLsJYc0vPu2tUDB2MuLhwmd0+yhsPtViKYMs6etPN8J/NLjvbcTXzmLVvE5UjNetpiNtxn368E9TNtplq1wWu76Ee6WhI0AIt01rAudFA= 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=Rlhz0ILd; arc=none smtp.client-ip=209.85.216.50 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="Rlhz0ILd" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-35a09e0dd63so106711a91.3 for ; Wed, 18 Mar 2026 09:12:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773850360; x=1774455160; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=FdZkBPAjksPIDRkwr96hfTI/z7pyk2jtrZdzb6oj8WA=; b=Rlhz0ILdoFxUc/ys1lsOvd05ytfTtyhVQw3Q+9mwF3BQSC7115gJMi0CxCF7+dXu1S tyHpSjZU2dM+QG+xSWJJvvYVMA2yRbZy+9A3bt4OI9SbYZqdjBeVGJcrliV6Jc6/qv2w MsxIF69r6UQO5KcAdkZHrrFJUHxtNlr5r9uid50dFy/KIqyVNk8GBOs6FZtg6+l2RHAo 4tTsEU1F5F+Yqx8imRtqei86c3scZqn02skxp8GhJ9/oCaI0DmS3pbx1LVi8ILsRmT9l PpwU6mD2LhTKg47GYwOivJDhrg2Q5lh9DP8E12YWu17TI4AMtRPgUD3zsVMzYmiEDSET J8Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773850360; x=1774455160; h=cc:to:in-reply-to:references: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=FdZkBPAjksPIDRkwr96hfTI/z7pyk2jtrZdzb6oj8WA=; b=hRRcLwBBoRYqW3rt4QStOXs+DIKCeusN90M/Nxo99Ee64MeVrhF4/IlXA6RAKbCtjU 77/QjYrrrDxhVpVebJWW0sNUCPowvAcvlgfs9OyNXthJ8mr7JUKGIIO5u2WToPH2N0Cc hM76Qb0v1PSi9y0N/R9MLnicx+xlYkNe7cNWO1/81oQSfYPq2fjQY6zjaqv7COZE09K8 DoEnYvfzdWbbF1Gu4/+54K2c2vHTl3iQzWwPj7o6OMF+G2jQgwbATfu69WJrwqtVvVxY UYG1rmceP97DFOQwWhj1MQduvAgynDbtErySoQmbbGyPmPDlAmZAqsuIDWdHLkhNwncm sTuw== X-Forwarded-Encrypted: i=1; AJvYcCVZ+6hnlIA8sWgaF498k/bDgSSuC0QG+eZjMK2q7ln5Y5trS155I3jUvFv8BvaQBhvcb3QIdBKoIyMxsQo=@vger.kernel.org X-Gm-Message-State: AOJu0YxmMaUduwzhfaqoZ5brFWSgsP1rBVzLZfI3nS8EYKUqi4ZFeQEQ YmhYc8DwnWzq9nVdMReYlZZgIfT7/smbxg2si4eAkQVSf5c7vkTj93IYz+rdDg== X-Gm-Gg: ATEYQzyhJL2MwCB3woYXeS98VjLx5e2BHayuqgqPNrdL4T6f4jQHpIlpiPaZdCujzyP BhIVpupSju1aspIT6tHnN6ui5vIVpjEa/pPqtvoPnOYi59c+LwHm0AN05iuiDCVMBeGeHv28ITI xhHfS4CxWcxB0mzEwL8gmIqG7HDluPTuWk//zSG2mgeIm+HkPwPi9io+Jfvv2jBBQCiDynoLLjU AANtqv1oYwXvWEQ4SKOJL6hpJdb4XDLcumeNh+tvgBmP42tixOLDN0g21f/3GK9BGC2TJlCV4SV 32WTfmgQ11B9akpzFQniECSn/DUg5HUfUaKpsuthwhGNfCtmbw8ztmQXTReZyBHd80weKtV6EJB SQIxhC9mDk2o3lnyjx3fNKMqIOQZYGsFCORGe967rADbsfbQM+ixiInegG9WNnY0rua9fofJQUe dXUB/XqoQ9X27yjnC3QjBMgeMBo2ZlEqOL+424 X-Received: by 2002:a17:902:d541:b0:2b0:5903:13fe with SMTP id d9443c01a7336-2b06e325bb6mr40567795ad.12.1773850359564; Wed, 18 Mar 2026 09:12:39 -0700 (PDT) Received: from junjungu-PC.localdomain ([223.167.147.240]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b06e430864sm43040915ad.18.2026.03.18.09.12.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 09:12:39 -0700 (PDT) From: Felix Gu Date: Thu, 19 Mar 2026 00:12:34 +0800 Subject: [PATCH 1/2] spi: sn-f-ospi: Fix resource leak in f_ospi_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: <20260319-sn-f-v1-1-33a6738d2da8@gmail.com> References: <20260319-sn-f-v1-0-33a6738d2da8@gmail.com> In-Reply-To: <20260319-sn-f-v1-0-33a6738d2da8@gmail.com> To: Mark Brown , Kunihiko Hayashi Cc: 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=1773850356; l=1715; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=v9woLIZgnstGAIF0Eth5tsY4n3LQFLhcy4LkO8NqurM=; b=XDxxe+Jl0TxFt2HOYzfrUi5I5sfII+Gc3wJ34vcts7QvZR4npV1kgcPV1wyR8IwJNvqj4wUru imfoKyZ7fO2CmdfVNO12C576YAKFIGOSveH9NbRZhjVSH3Js2nsZIyH X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= In f_ospi_probe(), when num_cs validation fails, it returns without calling spi_controller_put() on the SPI controller, which causes a resource leak. Use devm_spi_alloc_host() instead of spi_alloc_host() to ensure the SPI controller is properly freed when probe fails. Fixes: 1b74dd64c861 ("spi: Add Socionext F_OSPI SPI flash controller driver= ") Signed-off-by: Felix Gu --- drivers/spi/spi-sn-f-ospi.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/drivers/spi/spi-sn-f-ospi.c b/drivers/spi/spi-sn-f-ospi.c index bfcc140df810..1f554aa7ca27 100644 --- a/drivers/spi/spi-sn-f-ospi.c +++ b/drivers/spi/spi-sn-f-ospi.c @@ -612,7 +612,7 @@ static int f_ospi_probe(struct platform_device *pdev) u32 num_cs =3D OSPI_NUM_CS; int ret; =20 - ctlr =3D spi_alloc_host(dev, sizeof(*ospi)); + ctlr =3D devm_spi_alloc_host(dev, sizeof(*ospi)); if (!ctlr) return -ENOMEM; =20 @@ -635,16 +635,12 @@ static int f_ospi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, ospi); =20 ospi->base =3D devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(ospi->base)) { - ret =3D PTR_ERR(ospi->base); - goto err_put_ctlr; - } + if (IS_ERR(ospi->base)) + return PTR_ERR(ospi->base); =20 ospi->clk =3D devm_clk_get_enabled(dev, NULL); - if (IS_ERR(ospi->clk)) { - ret =3D PTR_ERR(ospi->clk); - goto err_put_ctlr; - } + if (IS_ERR(ospi->clk)) + return PTR_ERR(ospi->clk); =20 mutex_init(&ospi->mlock); =20 @@ -661,9 +657,6 @@ static int f_ospi_probe(struct platform_device *pdev) err_destroy_mutex: mutex_destroy(&ospi->mlock); =20 -err_put_ctlr: - spi_controller_put(ctlr); - return ret; } =20 --=20 2.43.0 From nobody Mon Apr 6 16:28:11 2026 Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) (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 0C7713EFD02 for ; Wed, 18 Mar 2026 16:12:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773850367; cv=none; b=ghA37fgEuP1S4tfpC3IelaUEape0FcQC9mZuY4JIEOoJI6wxECecAs4Tsdw7ZUvyfOBJ6Yn3LbljYcJmcYnAN1c6Xaq+G2/jzzY/B1O+38RoQHkBDWBOMA607Of9B9YrJnsJGOcdZwDCPOVCLgvsZGq0RzdkvfQZNaoKBlc1JdY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773850367; c=relaxed/simple; bh=zi/HkF2Wrkfy5CiTfwxTMFNPw3MG5goQInCNL8HtPhw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aGIG4Hr3te4DhKT1SOXA4epJKV8GBP1yFne6s7A803WwZjXe6FWgQUuIXvNEBDYdbt3ErjbgbQUFUjzNHyNYlL7ueb/VDzLLN09WOJGa461sT/TtzlCBliu9mCWmb+AzB9BelqWQQOHs565FXxUD72cPygPx16b3AxvSxRqFsoY= 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=H1/FdMlF; arc=none smtp.client-ip=209.85.216.52 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="H1/FdMlF" Received: by mail-pj1-f52.google.com with SMTP id 98e67ed59e1d1-358d80f60ccso59707a91.3 for ; Wed, 18 Mar 2026 09:12:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773850362; x=1774455162; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=scfnBMasoyrA80IqKi88Qi6oH/ECziYOs5/FKq35hhw=; b=H1/FdMlFYYg54dTyVpOcd4+9EtPZcajt4SPTfHuDYY4V0r1ruFFd+xlCtAl0kBj6g4 WAq6C6fvLvJoQdTzfdGYMNbCTGX+Eh0zcYPkT9Rlpsq6cVuXGfefV0RBqOUtelGkpmgV RWCtr/822IZHBGyjXEoYYSNu8vRS4sC175yrKh+QFPpYcY0Z3svsKrkCkVL56akUBqTp gCivA7hg0ccTypWLwOfj/On3AI08PLH5UUl3fxc0WeCWc//iPdnu8OIIruKrKU8s+wUo DeiWT1ZYPtj2UwyhG3RYOnjuMQBAzbaFuaaSyu6K4A0oWEVcdwHvinTrf8r06Okud6g3 F0hQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773850362; x=1774455162; h=cc:to:in-reply-to:references: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=scfnBMasoyrA80IqKi88Qi6oH/ECziYOs5/FKq35hhw=; b=EW6aQxDdUdnn3Uz2fV6e7uh0BUMmHSwI1Jv2w2A1sQQRv6gRGlnFHtzbCeZrAtf9+E ww7zOhquHOnL7tiRoLIksoUXGZ2kJ4dPoGy7Rfw6IijZJxJ2JkonWwiXiLVQGMgtHfvV 2M5Pj5OyYYZsYIj+PqzasBxq1NYLDyDgbniwhAbxgQLZaTuZ8dn7tET5W7UlclxelMX9 f5xYrcPcYbTTqDgZ6l3MYgIMsxxM80QXwB0vzMT+Rn1Y/lp6coZVW+Wylv2ku9fDXQPW zGXxmWO1qFn56iCjTO4v5xWF73duIWLfvbkiWLIbLpj7KRX7h3qX3a36YPj3ckgaQNaF 6vuw== X-Forwarded-Encrypted: i=1; AJvYcCXUxIehgQMwVhHhgFnKCZWZmzG3QXDoF4fReqxYv0gnLoJ67dHjniIMSZW8/H3bwmMAdiVOooTyLfKax8U=@vger.kernel.org X-Gm-Message-State: AOJu0YyuVMrS1ZFsm79tKNEZ0UoYkQxoWTn6YlSWULSJj/RjStKfMkOz eOeFkgvYZqLs8Ht0rxwEyWSOHfFR7s2iax9U3JqGLomrk+8f+j9p1+PK X-Gm-Gg: ATEYQzzT2Tan3eXkUzv7Vep85osWR+r+rNmIVS97ra75tmwjfgXhTYZ5IS0A6mhuaXL fVj2p3/9JGjNkMZh0AXC+Te6///yRamPj8OdRjCshY7HcTOx6Ke8F4sapPYGm+aINTfadgCF1es EnoPj34eBjDiLD5B/9e9mwL80fUMxrRydknKz+TTO1Y/A3iZm3MoXDtbRCwrhHPUyg94sSis3jY D6UsnxJUYnN7/5DIkb1QEVUohWKBgF9Pzbe2/apzAn0c4KO/vE14+K3tntSA7mSe4PWnE0YeM04 ANv5+2kR0fVM/JQWNQKgOj/wVnpP0L26n8faU1YY6gZ3UaHkYfWyyYH0hC3Z4ULNymJ52VeznPk g8HO2zdKG3xh2iit+UbJsTl4XOVbP7GdDIGnLyu0Qn8od3bWPVRz4/Yse9zDM0Qag6Hm7EnKbrY QXL8JxICKomVhNQbAfRH/JF9gr/1kqM1Pj9Hyn X-Received: by 2002:a17:902:d50b:b0:2ae:4d23:3364 with SMTP id d9443c01a7336-2b06e4353f8mr39579345ad.52.1773850361933; Wed, 18 Mar 2026 09:12:41 -0700 (PDT) Received: from junjungu-PC.localdomain ([223.167.147.240]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b06e430864sm43040915ad.18.2026.03.18.09.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2026 09:12:41 -0700 (PDT) From: Felix Gu Date: Thu, 19 Mar 2026 00:12:35 +0800 Subject: [PATCH 2/2] spi: sn-f-ospi: Use devm_mutex_init() to simplify code 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: <20260319-sn-f-v1-2-33a6738d2da8@gmail.com> References: <20260319-sn-f-v1-0-33a6738d2da8@gmail.com> In-Reply-To: <20260319-sn-f-v1-0-33a6738d2da8@gmail.com> To: Mark Brown , Kunihiko Hayashi Cc: 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=1773850356; l=1566; i=ustc.gu@gmail.com; h=from:subject:message-id; bh=zi/HkF2Wrkfy5CiTfwxTMFNPw3MG5goQInCNL8HtPhw=; b=Kt/80OoYepkAeakLlWwJRXmeLEu7GZ66hRYgm6U94ml5XAN9epfJjHYCybbDgD2fCvosO5WTH A34I8ji1JvdApq3Z3Hv7BJeGpnYRFcLoYAWmk7nQr93ieIHf4X+ECkA X-Developer-Key: i=ustc.gu@gmail.com; a=ed25519; pk=fjUXwmjchVN7Ja6KGP55IXOzFeCl9edaHoQIEUA+/hw= Switch to devm_mutex_init() to handle mutex destruction automatically. This simplifies the error paths in probe() and removes the need for an explicit mutex_destroy() in remove() callback. Signed-off-by: Felix Gu --- drivers/spi/spi-sn-f-ospi.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/drivers/spi/spi-sn-f-ospi.c b/drivers/spi/spi-sn-f-ospi.c index 1f554aa7ca27..3c61c799723b 100644 --- a/drivers/spi/spi-sn-f-ospi.c +++ b/drivers/spi/spi-sn-f-ospi.c @@ -642,29 +642,15 @@ static int f_ospi_probe(struct platform_device *pdev) if (IS_ERR(ospi->clk)) return PTR_ERR(ospi->clk); =20 - mutex_init(&ospi->mlock); - - ret =3D f_ospi_init(ospi); + ret =3D devm_mutex_init(dev, &ospi->mlock); if (ret) - goto err_destroy_mutex; + return ret; =20 - ret =3D devm_spi_register_controller(dev, ctlr); + ret =3D f_ospi_init(ospi); if (ret) - goto err_destroy_mutex; - - return 0; - -err_destroy_mutex: - mutex_destroy(&ospi->mlock); - - return ret; -} - -static void f_ospi_remove(struct platform_device *pdev) -{ - struct f_ospi *ospi =3D platform_get_drvdata(pdev); + return ret; =20 - mutex_destroy(&ospi->mlock); + return devm_spi_register_controller(dev, ctlr); } =20 static const struct of_device_id f_ospi_dt_ids[] =3D { @@ -679,7 +665,6 @@ static struct platform_driver f_ospi_driver =3D { .of_match_table =3D f_ospi_dt_ids, }, .probe =3D f_ospi_probe, - .remove =3D f_ospi_remove, }; module_platform_driver(f_ospi_driver); =20 --=20 2.43.0