From nobody Tue Apr 7 14:36:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E121386446; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; cv=none; b=cc7LU+2YnnvQwQitbEfrTJfPDOnGlz59OHAL/xeffDcxAT2+E5lZnahux7UE0mDBhkbMnGQv/sHXAKepP5Z1B6F6DB1E2hMLZaRN+PuJOX2RpAuzKsMaZJxVbmvk+y35tthHAGvXNvZbSOc0wfw5JjWQpBtqvB6GFZsQC53acIA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; c=relaxed/simple; bh=X52OF9MemHaAxpWAJbwJ9EXaiXR/WGE6scVInXZuSew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rls9WXq1ZIRBAKKDfany/F03eYdx3ZtOZix1FlhW6tttchqmLH6bZCk8VNIopI1XdMScu3/yb+8HMGPvFK5gX3QiQzm+9AjgDuyx4WerzYLIIuKAXvGdgFYj6XPIkrC06Xziyp9tGEfhwuQwuvjPSPq3v2OylQaJlCZ+dKQvRN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=abF9OwAt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="abF9OwAt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A5EFC2BC9E; Thu, 12 Mar 2026 15:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773328886; bh=X52OF9MemHaAxpWAJbwJ9EXaiXR/WGE6scVInXZuSew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=abF9OwAt1xs2HLLFcVc4rYuvPo/TfegISJQD/0YvOUrOw0J1a5Yz8dImeaxhuh+I6 dPjODEENUyG8uMDXmQG9pdXh1PQQc9BWFfC65Eba9lhETGmNvkHLjGUKL7HW86UBf2 3Y+iTO+B2n5I2Vc0Q3Ktvlm7DB41V9lylAHTHeT8RyFBUEIwA5IxonnaRCjN2UoBRv yN6vfMV6FFCXMblQ1c2dinqk+Q+avKWVBDiOT3xIe84+7Zpd/txFBE0ivotjMODfmf 6feMw7VHNwPo0PYGwDrayuLn2SxFfI4iaMqinigiGOis3eGd23A3iDKPMAE9v8csm9 RsGX2jeIqeBZg== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1w0hql-000000008PW-3Wpi; Thu, 12 Mar 2026 16:21:23 +0100 From: Johan Hovold To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, David Jander Subject: [PATCH 1/5] spi: fix use-after-free on controller registration failure Date: Thu, 12 Mar 2026 16:18:13 +0100 Message-ID: <20260312151817.32100-2-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260312151817.32100-1-johan@kernel.org> References: <20260312151817.32100-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sure to deregister from driver core also in the unlikely event that per-cpu statistics allocation fails during controller registration to avoid use-after-free (of driver resources) and unclocked register accesses. Fixes: 6598b91b5ac3 ("spi: spi.c: Convert statistics to per-cpu u64_stats_t= ") Cc: stable@vger.kernel.org # 6.0 Cc: David Jander Signed-off-by: Johan Hovold --- drivers/spi/spi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 61f7bde8c7fb..9b2e307dc30a 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3480,10 +3480,8 @@ int spi_register_controller(struct spi_controller *c= tlr) dev_info(dev, "controller is unqueued, this is deprecated\n"); } else if (ctlr->transfer_one || ctlr->transfer_one_message) { status =3D spi_controller_initialize_queue(ctlr); - if (status) { - device_del(&ctlr->dev); - goto free_bus_id; - } + if (status) + goto del_ctrl; } /* Add statistics */ ctlr->pcpu_statistics =3D spi_alloc_pcpu_stats(dev); @@ -3506,6 +3504,8 @@ int spi_register_controller(struct spi_controller *ct= lr) =20 destroy_queue: spi_destroy_queue(ctlr); +del_ctrl: + device_del(&ctlr->dev); free_bus_id: mutex_lock(&board_lock); idr_remove(&spi_controller_idr, ctlr->bus_num); --=20 2.52.0 From nobody Tue Apr 7 14:36:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E1C538552A; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; cv=none; b=f5oQt6Y6e0JiU+4rzy7kNAHyUGazeiU/vg/o0/Dl/bjZBa44m7qsiP9Oc5Swq+wh1HOD8F1Ln+4TIMgDTirB+ZDJsAafpWoqRGqXvk6dpDDEKwWUVUFvc+9wsUywQRCeM6xncmOlQPNYpLpjWLoIh2WlWGducI/bVBDvPZGFnJc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; c=relaxed/simple; bh=RUadj4HhKnVqicgv+dQt/skm0MEJJiaogxW6KV1m028=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SBd1cK2CbTXyHllxA2P6tWLIxslVUJUTu9Ho91MLZ39t4iRSmzhIemTeQMvVrM1RxH2ontY3hMStJyzQIqEOEVrepfwGnJsaPTLt9oBgU7B8bY37QYJxD1wN8Yw7EG/mpDo7LHSuRcqWzO4YnkiJQARK7F5haveoHChnZ25Zx2Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WDk5uriZ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WDk5uriZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CE49C2BCB0; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773328886; bh=RUadj4HhKnVqicgv+dQt/skm0MEJJiaogxW6KV1m028=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WDk5uriZpRK1M0qbSsxGy/elVNlFMOE5F1NZy5P3raa9wmmk6fL3M6avNBSoFqRBb MkSwjnhKkb1/zShTBmbhwpeiARfJqvgY+MK5geysUTNN4Vx2SW9PG+JzEwZbdnygUM PkWHKOAjEq3mCQxSBksrKQhLuYRHj7mMakALeHNWSJaRI6aZg7Yu3G0hd8M4/SJ77H MDHwmT5At3LMgnyLUkgX5ILNNq02iFlf8moqHq3fjm2ytolSwz4HeXZ/PPEUJP9Isn iQA5WFFv4pE4yZsGvmAWih6smP6kbQe8KWaYaTisnWGfvoLW+9D/WE/nwfM9cJ8ibO uHg8CROcNQT9A== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1w0hql-000000008PY-3ZHm; Thu, 12 Mar 2026 16:21:23 +0100 From: Johan Hovold To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org, David Jander Subject: [PATCH 2/5] spi: fix statistics allocation Date: Thu, 12 Mar 2026 16:18:14 +0100 Message-ID: <20260312151817.32100-3-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260312151817.32100-1-johan@kernel.org> References: <20260312151817.32100-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The controller per-cpu statistics is not allocated until after the controller has been registered with driver core, which leaves a window where accessing the sysfs attributes can trigger a NULL-pointer dereference. Fix this by moving the statistics allocation to controller allocation while tying its lifetime to that of the controller (rather than using implicit devres). Fixes: 6598b91b5ac3 ("spi: spi.c: Convert statistics to per-cpu u64_stats_t= ") Cc: stable@vger.kernel.org # 6.0 Cc: David Jander Signed-off-by: Johan Hovold --- drivers/spi/spi.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 9b2e307dc30a..53dee314d76a 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3049,6 +3049,8 @@ static void spi_controller_release(struct device *dev) struct spi_controller *ctlr; =20 ctlr =3D container_of(dev, struct spi_controller, dev); + + free_percpu(ctlr->pcpu_statistics); kfree(ctlr); } =20 @@ -3192,6 +3194,12 @@ struct spi_controller *__spi_alloc_controller(struct= device *dev, if (!ctlr) return NULL; =20 + ctlr->pcpu_statistics =3D spi_alloc_pcpu_stats(NULL); + if (!ctlr->pcpu_statistics) { + kfree(ctlr); + return NULL; + } + device_initialize(&ctlr->dev); INIT_LIST_HEAD(&ctlr->queue); spin_lock_init(&ctlr->queue_lock); @@ -3483,13 +3491,6 @@ int spi_register_controller(struct spi_controller *c= tlr) if (status) goto del_ctrl; } - /* Add statistics */ - ctlr->pcpu_statistics =3D spi_alloc_pcpu_stats(dev); - if (!ctlr->pcpu_statistics) { - dev_err(dev, "Error allocating per-cpu statistics\n"); - status =3D -ENOMEM; - goto destroy_queue; - } =20 mutex_lock(&board_lock); list_add_tail(&ctlr->list, &spi_controller_list); @@ -3502,8 +3503,6 @@ int spi_register_controller(struct spi_controller *ct= lr) acpi_register_spi_devices(ctlr); return status; =20 -destroy_queue: - spi_destroy_queue(ctlr); del_ctrl: device_del(&ctlr->dev); free_bus_id: --=20 2.52.0 From nobody Tue Apr 7 14:36:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65BC4391856; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; cv=none; b=t5HabNDSTMsVVv7tARZw4CrNvFkfnUUd+0HGKWiSsKsoI4MWLLm/y6/Zp2tGuHvLxhym6wRJNzM0ZtO4VXrMLBHZOnnFeWs0MmgGq9+RVat/DjlRNDERJatKGovz9RH7mjiFsBJng7ewJRYyYQRO+HWmwWBaugqrFyY9M1VSPCw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; c=relaxed/simple; bh=PWwFJnbWQC7RH+lSsXxqshJAP7fO4Wnei7MnG0HWrKU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DpJZpB/kagSs90waU61mTT4xJpN/meq73Tuzm9Dt4rCzMaOsOwfMhsSQC4ptXnkIU5BEZj6DWDTd8FQHhIGa0zfLIVMBByLE9w0L42aH7gm72DFcXfD17URUBCv2Bb+XaA95/XwjN7IB5t2ZZyGKTVPL//mX/Nn5aUufBilggkM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vbbd1dRE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vbbd1dRE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0F7F3C2BCAF; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773328886; bh=PWwFJnbWQC7RH+lSsXxqshJAP7fO4Wnei7MnG0HWrKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vbbd1dREG17Vg8V2cC1PoMH4C6AjTSKVBMVuHy0PRK9E3pqBkqxPhJO5BbqNN6/V5 rZuXQQr8CM0CpoEo54f3MINrRlojH5nAEAvmgC2vncHW8CYFTpFL9Ix+Cqpm2O613D R8Ktvii4+NzLXt6/oBqWOkEC2jVwZEke0VWDmsAX1/0sfUzrnLmgRlE6AkCUpo1WIR Ao5sWF6EF2Y7oALiyWxAYeOYkJO6DQk2WfWPiV0L+sv9I8VYABQH3LF7wcnwMIhtb4 +5RogfRc/LWgfKbg9lN/y6Srao5c7WfU+jgG8RCAAP52ZJhkpMBEJ9yWTBni/ZNAh1 cE4PxWTBPhXoA== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1w0hql-000000008Pa-3bcb; Thu, 12 Mar 2026 16:21:23 +0100 From: Johan Hovold To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 3/5] spi: drop unused devres statistics allocation Date: Thu, 12 Mar 2026 16:18:15 +0100 Message-ID: <20260312151817.32100-4-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260312151817.32100-1-johan@kernel.org> References: <20260312151817.32100-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Drop the now unused device managed per-cpu statistics allocation. Signed-off-by: Johan Hovold --- drivers/spi/spi.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 53dee314d76a..bfc42b75549a 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -96,25 +96,22 @@ static ssize_t driver_override_show(struct device *dev, } static DEVICE_ATTR_RW(driver_override); =20 -static struct spi_statistics __percpu *spi_alloc_pcpu_stats(struct device = *dev) +static struct spi_statistics __percpu *spi_alloc_pcpu_stats(void) { struct spi_statistics __percpu *pcpu_stats; + int cpu; =20 - if (dev) - pcpu_stats =3D devm_alloc_percpu(dev, struct spi_statistics); - else - pcpu_stats =3D alloc_percpu_gfp(struct spi_statistics, GFP_KERNEL); - - if (pcpu_stats) { - int cpu; + pcpu_stats =3D alloc_percpu_gfp(struct spi_statistics, GFP_KERNEL); + if (!pcpu_stats) + return NULL; =20 - for_each_possible_cpu(cpu) { - struct spi_statistics *stat; + for_each_possible_cpu(cpu) { + struct spi_statistics *stat; =20 - stat =3D per_cpu_ptr(pcpu_stats, cpu); - u64_stats_init(&stat->syncp); - } + stat =3D per_cpu_ptr(pcpu_stats, cpu); + u64_stats_init(&stat->syncp); } + return pcpu_stats; } =20 @@ -574,7 +571,7 @@ struct spi_device *spi_alloc_device(struct spi_controll= er *ctlr) return NULL; } =20 - spi->pcpu_statistics =3D spi_alloc_pcpu_stats(NULL); + spi->pcpu_statistics =3D spi_alloc_pcpu_stats(); if (!spi->pcpu_statistics) { kfree(spi); spi_controller_put(ctlr); @@ -3194,7 +3191,7 @@ struct spi_controller *__spi_alloc_controller(struct = device *dev, if (!ctlr) return NULL; =20 - ctlr->pcpu_statistics =3D spi_alloc_pcpu_stats(NULL); + ctlr->pcpu_statistics =3D spi_alloc_pcpu_stats(); if (!ctlr->pcpu_statistics) { kfree(ctlr); return NULL; --=20 2.52.0 From nobody Tue Apr 7 14:36:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E38B38644D; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; cv=none; b=YgHQW2saQO7lJ/C3qsiEhzTxbnbUvc6maOIuigP+hQGxk4+TDa7lEvarqZPZN20WZvpIgeRW6MLEKel4N1vOD8n9hehOt/pk3YLzQ+S47KazDJUeDmfuRsNkqCwTjY5QRe8Ane2LNmI6e/AEPeVTSsSFxOv7L+6FxewjdXpVAXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; c=relaxed/simple; bh=q3C/TW3hm+3wqtymCwQ2XcmPn7fC4hetmhRbMH7WDk0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KsfSEbo/nrKrWuAvdZIhfFHV5WUcembclu1agGdSCwhS3QuarC3Ke2I0e0FzX2nzITPBP8WKSkiuXtcc0jQ/dB7RR9+ORaZVBaLRCKGbtUXbMzNtbSCkId4jkgX85R04vTkknvRQh5a3vK4XZWnhHpmFUzmOMAdWs1zsXVPWtnw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gJVVjdmD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gJVVjdmD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F16E6C19424; Thu, 12 Mar 2026 15:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773328886; bh=q3C/TW3hm+3wqtymCwQ2XcmPn7fC4hetmhRbMH7WDk0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gJVVjdmDCWlJZ8C6QOHl31bJ4MRHTLTsOM5l5MwNetIYbBztnEU36xMH1mXO3J5Hx XVOiKq2DDfMQThLvslqo0Zf2IcMX37uve5bA2zZhrZ4zo3vkmP3h/jvAoIy3lOX4Xy o6G4fg4aBS65n17zT8UyLIyzG5km9KKjOIxKy7vSCaqqDeCwG4SycaBY3muTGgcJnq zhw7q0tdRUppdJJF0LqE3amVHwnpuTw4s/oLodHXovKPoSKA6fBJpEZ2UAdbNuQgd/ M6OdstsnyDoIVZ/deT1NDXzIHetUIrOZrE8djjWvfgdHap7GurFT5tsGEK4jYCUSfa AJ6wM5rDSXRkw== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1w0hql-000000008Pc-3e1C; Thu, 12 Mar 2026 16:21:23 +0100 From: Johan Hovold To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 4/5] spi: fix misleading controller registration kernel-doc Date: Thu, 12 Mar 2026 16:18:16 +0100 Message-ID: <20260312151817.32100-5-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260312151817.32100-1-johan@kernel.org> References: <20260312151817.32100-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The controller reference count is not decremented on registration failures (and has not been for a very long time) contrary to what the outdated kernel-doc says. Drop the entire sentence about return values which are now documented in the Return section. Fixes: b885244eb262 ("[PATCH] spi: add spi_driver to SPI framework") Signed-off-by: Johan Hovold --- drivers/spi/spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index bfc42b75549a..34aca18a96d8 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3388,8 +3388,8 @@ static int spi_controller_id_alloc(struct spi_control= ler *ctlr, int start, int e * device identification, boards need configuration tables telling which * chip is at which address. * - * This must be called from context that can sleep. It returns zero on - * success, else a negative error code (dropping the controller's refcount= ). + * This must be called from context that can sleep. + * * After a successful return, the caller is responsible for calling * spi_unregister_controller(). * --=20 2.52.0 From nobody Tue Apr 7 14:36:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3E299386449; Thu, 12 Mar 2026 15:21:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; cv=none; b=mtkO3tFrS6qP/e6dePh4TzEvbfnMhKY0EqeXmHv8opc9UOq0qxrN3bem8GJadp4+j9Xz5GqReadIuw/OLCaCLX0nI9lP8/Dv7Ng56btdx9DeMQN1tI1IbqiSYcfQ4NuI5fz/Icg5VpW0kHh3neg9ycG6x+1GjbMQ8dQgJC3bQIc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773328886; c=relaxed/simple; bh=cEcD0t5vPgnAXtmH+U4gX2l+bU3wARMJi4cKEDyPYhc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z3Th2Vwn7saEn1eCkEE+ouY7l68fi0nydOpxWPcIwY8cyL9YFqbRq9mXLKfJOfKeV7thJQLcifLEHH8u8r3oxBoICH+bTeBKbHgl4XDlrvs+cPGhu//nYpZIMViuFXJ6jbfhbciqrQeEenumV56s6ovuNU/xD0VBK8bQ7EaJv9A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VsAw1KTr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VsAw1KTr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 051EAC2BC86; Thu, 12 Mar 2026 15:21:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773328886; bh=cEcD0t5vPgnAXtmH+U4gX2l+bU3wARMJi4cKEDyPYhc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VsAw1KTrb9NMmEnraigsJhgupLuFpGBCi6dZoYex19wJGxCXh6hG8a+K8Tzsc+iQr 8vO+N1pTEXMYtBhmJJfJleOYS/NJ83e+wzcqq8RV904PK4wRvnDaFaYYKo32+PC7vE yJIztTHZukmlLQ2t9TZOGbsJIeQltvXsLP4Lu0vgzX0pHQ8eBSxhW2DDs315sXCMMZ ZGHu7z8I/T7q00uzT+qXjSOesTORREoPu32rq+nurPeqa+Lov1+v6BINyKXJYWTk6U CQV9Q9uDWuSpzWtp0QvpT37J06St+O88SoQ9oTX2LksG5h2aFxOILKv5+OJenUwrCE OL5pTqNSbmU7Q== Received: from johan by xi.lan with local (Exim 4.98.2) (envelope-from ) id 1w0hql-000000008Pe-3gNm; Thu, 12 Mar 2026 16:21:23 +0100 From: Johan Hovold To: Mark Brown Cc: linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH 5/5] spi: fix misleading controller deregistration kernel-doc Date: Thu, 12 Mar 2026 16:18:17 +0100 Message-ID: <20260312151817.32100-6-johan@kernel.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260312151817.32100-1-johan@kernel.org> References: <20260312151817.32100-1-johan@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The controller reference count is not decremented on deregistration if the controller has been allocated using devm_spi_alloc_host/target(). Amend the kernel-doc for devm_spi_register_controller() and spi_unregister_controller() so that it reflects this (more recent) behaviour. Fixes: 5e844cc37a5c ("spi: Introduce device-managed SPI controller allocati= on") Signed-off-by: Johan Hovold --- drivers/spi/spi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 34aca18a96d8..b5e2f1e1a89e 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3523,7 +3523,8 @@ static void devm_spi_unregister_controller(void *ctlr) * Context: can sleep * * Register a SPI device as with spi_register_controller() which will - * automatically be unregistered and freed. + * automatically be unregistered (and freed unless it has been allocated u= sing + * devm_spi_alloc_host/target()). * * Return: zero on success, else a negative error code. */ @@ -3557,7 +3558,8 @@ static int __unregister(struct device *dev, void *nul= l) * * This must be called from context that can sleep. * - * Note that this function also drops a reference to the controller. + * Note that this function also drops a reference to the controller unless= it + * has been allocated using devm_spi_alloc_host/target(). */ void spi_unregister_controller(struct spi_controller *ctlr) { --=20 2.52.0