From: Stefan Wahren <stefan.wahren@i2se.com>
Date: Thu, 25 May 2017 22:26:20 +0000 (+0200)
Subject: staging: vchiq_core: Bailout if VCHIQ state is already initialized
X-Git-Tag: v4.14-rc1~623^2~226
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=359afaccd97e6257bcda29efa4e83375d9a2cc34;p=platform%2Fkernel%2Flinux-rpi.git

staging: vchiq_core: Bailout if VCHIQ state is already initialized

In case VCHIQ state is already initialized we need to bailout
in order to aovid a memory leak.

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 c47de96..0a46e15 100644
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c
@@ -2355,6 +2355,11 @@ vchiq_init_state(VCHIQ_STATE_T *state, VCHIQ_SLOT_ZERO_T *slot_zero,
 		"%s: slot_zero = %pK, is_master = %d",
 		__func__, slot_zero, is_master);
 
+	if (vchiq_states[0]) {
+		pr_err("%s: VCHIQ state already initialized\n", __func__);
+		return VCHIQ_ERROR;
+	}
+
 	/* Check the input configuration */
 
 	if (slot_zero->magic != VCHIQ_MAGIC) {