From mboxrd@z Thu Jan 1 00:00:00 1970 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 837C8EEB5; Fri, 6 Jun 2025 15:43:36 +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=1749224616; cv=none; b=ZCV/z67PSDr66VEkOsc4CG39NgQTpFilnRLR9yX8otPYCmPjQNibjOR8hKFpTGIgn+K20yhUpLCYQPPlmVuzg4FjYWUVZO9jkBzb4YxU9XI7vW4d7A85Ki5XF1ZVqTXCA1q1YlEl9fPA8LhaQqo+5alLUW58nCq0k02KC1PjCw8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749224616; c=relaxed/simple; bh=yBasjdLbILx5emK1wfV/acnTnriWBCg/8x+dDas1FYw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cEciJzlYLZT1XbW3QqqeKoqs8gwEcZxKxta+RA5KAkefrjNnsxgvVJbBe8+fVwJIf+ZQauD0WnlTD4hDp1LNFRH/S5SnfGqNKckhc4f3JYC7e+0w2fXfAJV9B6XEl5/a5A6IbSO5j67vh31DT7fgC2ktFiVy1Jmw2t4sB09g0V8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=M9ArHDEw; 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="M9ArHDEw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9972BC4CEF0; Fri, 6 Jun 2025 15:43:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749224616; bh=yBasjdLbILx5emK1wfV/acnTnriWBCg/8x+dDas1FYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M9ArHDEw8DYp/6noE6EkwnwfieSENbDhkwoK8kqq5XZXfLG+bLO/oVcGrK0bspaKj 2ZAwueh+htArG00qQ9Dzo9gfEBPDJtQvPqPosq8ebupztSd5gjjRxoV6ulgrZcRfpt YjboXbT4ODkuxa816952Lk32EuKL326j7ZaRXqk7Tte6dI14+ndZf7GE135Kp/fARz PTgvhiBbi3eDSA8Nxo70zaRH8zakkMOlIgIn/5FOPRXo7JbjIQ8ry5Cy1qTY0G8yYu 1S+oR6DK2WE70I34C1GGreDkgKr25+pZ85VV/rMy9llbMAKIMu+6m3PxYsWirIm03v 4mwUqc98PRFBA== From: Sasha Levin To: patches@lists.linux.dev, stable@vger.kernel.org Cc: Peng Fan , Jassi Brar , Sasha Levin , linux-kernel@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 06/13] mailbox: Not protect module_put with spin_lock_irqsave Date: Fri, 6 Jun 2025 11:43:19 -0400 Message-Id: <20250606154327.547792-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250606154327.547792-1-sashal@kernel.org> References: <20250606154327.547792-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.93 Content-Transfer-Encoding: 8bit From: Peng Fan [ Upstream commit dddbd233e67e792bb0a3f9694a4707e6be29b2c6 ] &chan->lock is not supposed to protect 'chan->mbox'. And in __mbox_bind_client, try_module_get is also not protected by &chan->lock. So move module_put out of the lock protected region. Signed-off-by: Peng Fan Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- **YES** This commit should be backported to stable kernel trees. **Analysis:** 1. **Clear Bug Fix**: The commit fixes an improper use of `module_put()` under a spinlock in `mbox_free_channel()`. Looking at the current code in `/home/sasha/linux/drivers/mailbox/mailbox.c:489`, `module_put()` is called while holding `&chan->lock` with `spin_lock_irqsave()`. 2. **Locking Inconsistency**: The commit message correctly identifies that `&chan->lock` is not supposed to protect `chan->mbox`. In `__mbox_bind_client()` (line 324), `try_module_get(chan->mbox->dev->driver->owner)` is called **outside** the spinlock protection, making the current `module_put()` placement inconsistent. 3. **Minimal Risk Change**: The fix is extremely simple and low-risk - it just moves one line (`module_put()`) outside the spinlock region. This maintains the same operation order but fixes the locking issue. 4. **No Side Effects**: Moving `module_put()` outside the lock doesn't change the functionality or introduce new race conditions. The `module_put()` implementation uses `atomic_dec_if_positive()`, so it's safe to call without additional locking. 5. **Follows Stable Rules**: This commit: - Fixes a real locking issue that could potentially cause problems - Is small and contained (single line move) - Has minimal regression risk - Doesn't introduce new features or architectural changes 6. **Similar Pattern**: Looking at similar commits in the historical references, commits that fix locking issues (like Similar Commit #5 which fixed a locking bug in mailbox-test) were marked as YES for backporting. The commit addresses a legitimate kernel locking violation where `module_put()` should not be called under a spinlock, making it a suitable candidate for stable tree backporting. drivers/mailbox/mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index f13d705f7861a..cb59b4dbad626 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -500,8 +500,8 @@ void mbox_free_channel(struct mbox_chan *chan) if (chan->txdone_method == TXDONE_BY_ACK) chan->txdone_method = TXDONE_BY_POLL; - module_put(chan->mbox->dev->driver->owner); spin_unlock_irqrestore(&chan->lock, flags); + module_put(chan->mbox->dev->driver->owner); } EXPORT_SYMBOL_GPL(mbox_free_channel); -- 2.39.5