Commit 6f2370d2 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman

staging: vchiq_core: Don't BUG if process is unexpected

Bail out properly if the process index doesn't match the remote insert.
We also drop the BUG in case the process index is at local insert,
so we can trigger the WARN_ON again some steps later.
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5d1a94bb
...@@ -1963,9 +1963,14 @@ parse_rx_slots(VCHIQ_STATE_T *state) ...@@ -1963,9 +1963,14 @@ parse_rx_slots(VCHIQ_STATE_T *state)
mutex_unlock(&service->bulk_mutex); mutex_unlock(&service->bulk_mutex);
break; break;
} }
if (queue->process != queue->remote_insert) {
BUG_ON(queue->process == queue->local_insert); pr_err("%s: p %x != ri %x\n",
BUG_ON(queue->process != queue->remote_insert); __func__,
queue->process,
queue->remote_insert);
mutex_unlock(&service->bulk_mutex);
goto bail_not_ready;
}
bulk = &queue->bulks[ bulk = &queue->bulks[
BULK_INDEX(queue->remote_insert)]; BULK_INDEX(queue->remote_insert)];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment