Commit 81a8b542 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman

staging: vchiq_core: fix service dereference in unlock_service

The service state is dereferenced before BUG_ON and outside of the
spin lock. So in order to avoid possible NULL pointer dereferences or
races move the whole scope at a safer place.

This issue has been found by Cppcheck.
Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2ea15699
...@@ -296,12 +296,13 @@ lock_service(VCHIQ_SERVICE_T *service) ...@@ -296,12 +296,13 @@ lock_service(VCHIQ_SERVICE_T *service)
void void
unlock_service(VCHIQ_SERVICE_T *service) unlock_service(VCHIQ_SERVICE_T *service)
{ {
VCHIQ_STATE_T *state = service->state;
spin_lock(&service_spinlock); spin_lock(&service_spinlock);
BUG_ON(!service || (service->ref_count == 0)); BUG_ON(!service || (service->ref_count == 0));
if (service && service->ref_count) { if (service && service->ref_count) {
service->ref_count--; service->ref_count--;
if (!service->ref_count) { if (!service->ref_count) {
VCHIQ_STATE_T *state = service->state;
BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE); BUG_ON(service->srvstate != VCHIQ_SRVSTATE_FREE);
state->services[service->localport] = NULL; state->services[service->localport] = NULL;
} else } else
......
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