target/linux/brcm2708/patches-4.9/950-0096-vchiq_arm-Access-the-dequeue_pending-flag-locked.patch

   1 From 64e39b18b8d51eb332a84ef79ed3ce0dd2a76808 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Wed, 23 Mar 2016 14:16:25 +0000
   4 Subject: [PATCH] vchiq_arm: Access the dequeue_pending flag locked
   5
   6 Reading through this code looking for another problem (now found in userland)
   7 the use of dequeue_pending outside a lock didn't seem safe.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  10 ---
  11  .../vc04_services/interface/vchiq_arm/vchiq_arm.c       | 17 ++++++++++++-----
  12  1 file changed, 12 insertions(+), 5 deletions(-)
  13
  14 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
  15 +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
  16 @@ -279,6 +279,7 @@ service_callback(VCHIQ_REASON_T reason,
  17         USER_SERVICE_T *user_service;
  18         VCHIQ_SERVICE_T *service;
  19         VCHIQ_INSTANCE_T instance;
  20 +       int skip_completion = 0;
  21         DEBUG_INITIALISE(g_state.local)
  22
  23         DEBUG_TRACE(SERVICE_CALLBACK_LINE);
  24 @@ -345,9 +346,6 @@ service_callback(VCHIQ_REASON_T reason,
  25                 user_service->msg_queue[user_service->msg_insert &
  26                         (MSG_QUEUE_SIZE - 1)] = header;
  27                 user_service->msg_insert++;
  28 -               spin_unlock(&msg_queue_spinlock);
  29 -
  30 -               up(&user_service->insert_event);
  31
  32                 /* If there is a thread waiting in DEQUEUE_MESSAGE, or if
  33                 ** there is a MESSAGE_AVAILABLE in the completion queue then
  34 @@ -356,13 +354,22 @@ service_callback(VCHIQ_REASON_T reason,
  35                 if (((user_service->message_available_pos -
  36                         instance->completion_remove) >= 0) ||
  37                         user_service->dequeue_pending) {
  38 -                       DEBUG_TRACE(SERVICE_CALLBACK_LINE);
  39                         user_service->dequeue_pending = 0;
  40 -                       return VCHIQ_SUCCESS;
  41 +                       skip_completion = 1;
  42                 }
  43
  44 +               spin_unlock(&msg_queue_spinlock);
  45 +
  46 +               up(&user_service->insert_event);
  47 +
  48                 header = NULL;
  49         }
  50 +
  51 +       if (skip_completion) {
  52 +               DEBUG_TRACE(SERVICE_CALLBACK_LINE);
  53 +               return VCHIQ_SUCCESS;
  54 +       }
  55 +
  56         DEBUG_TRACE(SERVICE_CALLBACK_LINE);
  57
  58         return add_completion(instance, reason, header, user_service,