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: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
index 9cdc98570a22b168c231b930f91bdb0e5a27a676..b0119b80b776a1f596b0e7bbe35778c5a8bcf60a 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -1963,9 +1963,14 @@ parse_rx_slots(VCHIQ_STATE_T *state)
                                        mutex_unlock(&service->bulk_mutex);
                                        break;
                                }
-
-                               BUG_ON(queue->process == queue->local_insert);
-                               BUG_ON(queue->process != queue->remote_insert);
+                               if (queue->process != queue->remote_insert) {
+                                       pr_err("%s: p %x != ri %x\n",
+                                              __func__,
+                                              queue->process,
+                                              queue->remote_insert);
+                                       mutex_unlock(&service->bulk_mutex);
+                                       goto bail_not_ready;
+                               }
 
                                bulk = &queue->bulks[
                                        BULK_INDEX(queue->remote_insert)];