FAILED: patch "[PATCH] i2c: imx: Fix slave registration race and error handling" failed to apply to 5.15-stable tree
Subsystems (4)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x d64ec362c369bbc33833f7936d5f3a706b0d5c45
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026080514-trimester-ultra-2ca2@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From d64ec362c369bbc33833f7936d5f3a706b0d5c45 Mon Sep 17 00:00:00 2001
From: Liem <[email protected]>
Date: Mon, 29 Jun 2026 10:38:28 +0800
Subject: [PATCH] i2c: imx: Fix slave registration race and error handling
In i2c_imx_reg_slave(), the slave pointer was assigned before pm_runtime_resume_and_get(). If pm_runtime_resume_and_get() failed, the error path returned without clearing i2c_imx->slave, leaving it non-NULL and causing all subsequent registration attempts to fail with -EBUSY.
Additionally, because this driver uses a shared IRQ, the interrupt handler i2c_imx_isr() can execute concurrently and, after acquiring slave_lock, dereference i2c_imx->slave. The previous fix attempt added a lockless i2c_imx->slave = NULL on the error path, but that could race with the ISR under the lock and still cause a NULL pointer dereference.
Fix both issues by deferring the assignment of i2c_imx->slave and i2c_imx->last_slave_event to after a successful resume, and by performing the assignment inside the slave_lock critical section. This guarantees that the slave pointer is never left stale on the error path and is always valid when observed by the interrupt handler.
drivers/i2c/busses/i2c-imx.c +5 -3
@@ -930,9 +930,6 @@ static int i2c_imx_reg_slave(struct i2c_client *client)if (i2c_imx->slave)return -EBUSY ; - i2c_imx->slave = client; - i2c_imx->last_slave_event =I2C_SLAVE_STOP ; -/* Resume */ ret =pm_runtime_resume_and_get (i2c_imx->adapter.dev.parent);if (ret <0 ) {
@@ -940,6 +937,11 @@ static int i2c_imx_reg_slave(struct i2c_client *client)return ret; } + scoped_guard(spinlock_irqsave, &i2c_imx->slave_lock) { + i2c_imx->slave = client; + i2c_imx->last_slave_event =I2C_SLAVE_STOP ; + } +i2c_imx_slave_init (i2c_imx);return 0 ;
Sasha Levin
maintainerPATCH 1/1 i2c: imx: Fix slave registration race and error handling
From: Liem <[email protected]>
[ Upstream commit d64ec362c369bbc33833f7936d5f3a706b0d5c45 ]
In i2c_imx_reg_slave(), the slave pointer was assigned before pm_runtime_resume_and_get(). If pm_runtime_resume_and_get() failed, the error path returned without clearing i2c_imx->slave, leaving it non-NULL and causing all subsequent registration attempts to fail with -EBUSY.
Additionally, because this driver uses a shared IRQ, the interrupt handler i2c_imx_isr() can execute concurrently and, after acquiring slave_lock, dereference i2c_imx->slave. The previous fix attempt added a lockless i2c_imx->slave = NULL on the error path, but that could race with the ISR under the lock and still cause a NULL pointer dereference.
Fix both issues by deferring the assignment of i2c_imx->slave and i2c_imx->last_slave_event to after a successful resume, and by performing the assignment inside the slave_lock critical section. This guarantees that the slave pointer is never left stale on the error path and is always valid when observed by the interrupt handler.
--- drivers/i2c/busses/i2c-imx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-imx.c +6 -3
@@ -832,14 +832,12 @@ static void i2c_imx_slave_init(struct imx_i2c_struct *i2c_imx)static int i2c_imx_reg_slave (struct i2c_client *client) {struct imx_i2c_struct *i2c_imx =i2c_get_adapdata (client->adapter); +unsigned long flags;int ret;if (i2c_imx->slave)return -EBUSY ; - i2c_imx->slave = client; - i2c_imx->last_slave_event =I2C_SLAVE_STOP ; -/* Resume */ ret =pm_runtime_resume_and_get (i2c_imx->adapter.dev.parent);if (ret <0 ) {
@@ -847,6 +845,11 @@ static int i2c_imx_reg_slave(struct i2c_client *client)return ret; } +spin_lock_irqsave (&i2c_imx->slave_lock, flags); + i2c_imx->slave = client; + i2c_imx->last_slave_event =I2C_SLAVE_STOP ; +spin_unlock_irqrestore (&i2c_imx->slave_lock, flags); +i2c_imx_slave_init (i2c_imx);return 0 ;
Signature · 1 line
2.53.0