openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vchiq_arm: Fix unlocked access to dequeue_pending 

The dequeue_pending flag wasn't protected by a spinlock in the
service_callback. So fix this to make it safe.

Signed-off-by: Phil Elwell <phil@raspberrypi.org>
Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Phil Elwell 2017-01-17 20:56:12 +00:00 committed by Greg Kroah-Hartman
parent c599a22e60
commit 72ed1db4cd
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
View File

@ -279,6 +279,7 @@ service_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header,
USER_SERVICE_T *user_service; USER_SERVICE_T *user_service;
VCHIQ_SERVICE_T *service; VCHIQ_SERVICE_T *service;
VCHIQ_INSTANCE_T instance; VCHIQ_INSTANCE_T instance;
bool skip_completion = false;
DEBUG_INITIALISE(g_state.local) DEBUG_INITIALISE(g_state.local)
DEBUG_TRACE(SERVICE_CALLBACK_LINE); DEBUG_TRACE(SERVICE_CALLBACK_LINE);
@ -345,9 +346,6 @@ service_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header,
user_service->msg_queue[user_service->msg_insert & user_service->msg_queue[user_service->msg_insert &
(MSG_QUEUE_SIZE - 1)] = header; (MSG_QUEUE_SIZE - 1)] = header;
user_service->msg_insert++; user_service->msg_insert++;
spin_unlock(&msg_queue_spinlock);
up(&user_service->insert_event);
/* If there is a thread waiting in DEQUEUE_MESSAGE, or if /* If there is a thread waiting in DEQUEUE_MESSAGE, or if
** there is a MESSAGE_AVAILABLE in the completion queue then ** there is a MESSAGE_AVAILABLE in the completion queue then
@ -356,15 +354,20 @@ service_callback(VCHIQ_REASON_T reason, VCHIQ_HEADER_T *header,
if (((user_service->message_available_pos - if (((user_service->message_available_pos -
instance->completion_remove) >= 0) || instance->completion_remove) >= 0) ||
user_service->dequeue_pending) { user_service->dequeue_pending) {
DEBUG_TRACE(SERVICE_CALLBACK_LINE);
user_service->dequeue_pending = 0; user_service->dequeue_pending = 0;
return VCHIQ_SUCCESS; skip_completion = true;
} }
spin_unlock(&msg_queue_spinlock);
up(&user_service->insert_event);
header = NULL; header = NULL;
} }
DEBUG_TRACE(SERVICE_CALLBACK_LINE); DEBUG_TRACE(SERVICE_CALLBACK_LINE);
if (skip_completion)
return VCHIQ_SUCCESS;
return add_completion(instance, reason, header, user_service, return add_completion(instance, reason, header, user_service,
bulk_userdata); bulk_userdata);
} }