From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2105FC5472F for ; Tue, 27 Aug 2024 14:35:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=XWmaGsFV8+sUx0IL98EYus9x9tg6qc5lWhD4xE5HgsQ=; b=nUvMh94af0BR+uMinsyWC9VrY1 d3kAw4veeOGIWbD5GW8SwqD3C/wTitkA51mZ+k1rxFgELG+NqoO3XYzcrFLKW9MV9zcZZIu9y2bzR zjNMuPg6kUWhsW54/kZ2GzH8sXxN4gS6TESSzg845hx+shjB2KTDPzk1Z1azwlcu7BSiBeGeTXEyO mdWKLO1dnskxRSszEHyR3BDc4gT55qh2anbQN51x5TB3EqOAd5xPSreoDBbP+U9A+vaTOQ0nCbCQ3 YLM1WAyTcsPaufZAdBFwQyVdbl7eeoWWwqKiTzTq0XQnQSNkcPypkL5rYu/MFE0hN4DhaGhgBwHXM eCEbWg5w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sixHb-0000000BfjJ-1xF8; Tue, 27 Aug 2024 14:34:55 +0000 Received: from out-176.mta1.migadu.com ([95.215.58.176]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sixG7-0000000BfJ8-3RDc for linux-arm-kernel@lists.infradead.org; Tue, 27 Aug 2024 14:33:25 +0000 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1724769199; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XWmaGsFV8+sUx0IL98EYus9x9tg6qc5lWhD4xE5HgsQ=; b=YsTFx34PNk7Ga/NYjNt19CsN8uHxJDTJGmwk4VC2VD8wqw41gMqdN5xPAf6wXdOAdJJyHb /KVl0xPAYKz43cJn6S89wGjU1SHV2qsiwMiOhK4JAADXH0cuvQFjlODwbK4bNPXwdF1Ift bo5xJtylWC6MKUV3txwzr7oKOhQhEaY= From: Wen Yang To: Sudeep Holla , Cristian Marussi Cc: Wen Yang , arm-scmi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] firmware: arm_scmi: protect xfer->async_done with xfer->lock when changing and using it Date: Tue, 27 Aug 2024 22:32:37 +0800 Message-Id: <20240827143237.10208-1-wen.yang@linux.dev> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240827_073324_153237_19E05D3F X-CRM114-Status: GOOD ( 11.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org do_xfer_with_response() first assigns xfer->async_done to &async_response, then calls wait_for_completion_timeout(), and finally sets xfer->async_done to null. However, scmi_handle_response() may calls complete(xfer->async_done) while xfer->async_done is null, may causing a crash. Protect xfer->async_done with xfer->lock when changing and using it, just like scmi_msg_response_validate(). Signed-off-by: Wen Yang Cc: Sudeep Holla Cc: Cristian Marussi Cc: arm-scmi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- drivers/firmware/arm_scmi/driver.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 66806578df5a..24ed94e3cbd4 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c @@ -1110,6 +1110,7 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo, { struct scmi_xfer *xfer; struct scmi_info *info = handle_to_scmi_info(cinfo->handle); + unsigned long flags; xfer = scmi_xfer_command_acquire(cinfo, msg_hdr); if (IS_ERR(xfer)) { @@ -1144,7 +1145,10 @@ static void scmi_handle_response(struct scmi_chan_info *cinfo, if (xfer->hdr.type == MSG_TYPE_DELAYED_RESP) { scmi_clear_channel(info, cinfo); - complete(xfer->async_done); + spin_lock_irqsave(&xfer->lock, flags); + if (xfer->async_done) + complete(xfer->async_done); + spin_unlock_irqrestore(&xfer->lock, flags); scmi_inc_count(info->dbg->counters, DELAYED_RESPONSE_OK); } else { complete(&xfer->done); @@ -1479,9 +1483,13 @@ static int do_xfer_with_response(const struct scmi_protocol_handle *ph, struct scmi_xfer *xfer) { int ret, timeout = msecs_to_jiffies(SCMI_MAX_RESPONSE_TIMEOUT); + unsigned long flags; + DECLARE_COMPLETION_ONSTACK(async_response); + spin_lock_irqsave(&xfer->lock, flags); xfer->async_done = &async_response; + spin_unlock_irqrestore(&xfer->lock, flags); /* * Delayed responses should not be polled, so an async command should @@ -1503,7 +1511,10 @@ static int do_xfer_with_response(const struct scmi_protocol_handle *ph, } } + spin_lock_irqsave(&xfer->lock, flags); xfer->async_done = NULL; + spin_unlock_irqrestore(&xfer->lock, flags); + return ret; } -- 2.25.1