linux-kernel - [PATCH] rpmsg: smd: Read remote state from channel info

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Tue, 27 Feb 2018 16:20:52 -0800
From:   Bjorn Andersson <bjorn.andersson@...aro.org>
To:     Ohad Ben-Cohen <ohad@...ery.com>,
        Bjorn Andersson <bjorn.andersson@...aro.org>,
        Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Cc:     linux-remoteproc@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: [PATCH] rpmsg: smd: Read remote state from channel info

In some cases the remote processor does not trigger an interrupt when
transitioning a channel from OPENING to OPENED state and as such the
value of the cached "remote_state" will be stale.

Read the state directly from the "channel info" while waiting for the
remote to negotiate the channel state in order to remove false negatives
due to this.

Fixes: 268105fbc0f8 ("rpmsg: smd: Perform handshake during open")
Reported-by: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@...aro.org>
---
 drivers/rpmsg/qcom_smd.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c
index 92d0c6a7a837..553a6c395f93 100644
--- a/drivers/rpmsg/qcom_smd.c
+++ b/drivers/rpmsg/qcom_smd.c
@@ -815,8 +815,8 @@ static int qcom_smd_channel_open(struct qcom_smd_channel *channel,
 
 	/* Wait for remote to enter opening or opened */
 	ret = wait_event_interruptible_timeout(channel->state_change_event,
-			channel->remote_state == SMD_CHANNEL_OPENING ||
-			channel->remote_state == SMD_CHANNEL_OPENED,
+			GET_RX_CHANNEL_INFO(channel, state) == SMD_CHANNEL_OPENING ||
+			GET_RX_CHANNEL_INFO(channel, state) == SMD_CHANNEL_OPENED,
 			HZ);
 	if (!ret) {
 		dev_err(&edge->dev, "remote side did not enter opening state\n");
@@ -827,7 +827,7 @@ static int qcom_smd_channel_open(struct qcom_smd_channel *channel,
 
 	/* Wait for remote to enter opened */
 	ret = wait_event_interruptible_timeout(channel->state_change_event,
-			channel->remote_state == SMD_CHANNEL_OPENED,
+			GET_RX_CHANNEL_INFO(channel, state) == SMD_CHANNEL_OPENED,
 			HZ);
 	if (!ret) {
 		dev_err(&edge->dev, "remote side did not enter open state\n");
-- 
2.16.2