From patchwork Mon Jul 16 18:08:59 2012
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Colin Ian King <colin.king@canonical.com>
X-Patchwork-Id: 171231
Return-Path: <fwts-devel-bounces@lists.ubuntu.com>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from chlorine.canonical.com (chlorine.canonical.com
	[91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 79D5C2C0103
	for <incoming@patchwork.ozlabs.org>;
	Tue, 17 Jul 2012 04:09:10 +1000 (EST)
Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com)
	by chlorine.canonical.com with esmtp (Exim 4.71)
	(envelope-from <fwts-devel-bounces@lists.ubuntu.com>)
	id 1SqpjJ-0007Aa-8q
	for incoming@patchwork.ozlabs.org; Mon, 16 Jul 2012 18:09:09 +0000
Received: from youngberry.canonical.com ([91.189.89.112])
	by chlorine.canonical.com with esmtp (Exim 4.71)
	(envelope-from <colin.king@canonical.com>) id 1SqpjH-0007AV-7x
	for fwts-devel@lists.ubuntu.com; Mon, 16 Jul 2012 18:09:07 +0000
Received: from 74-95-45-185-oregon.hfc.comcastbusiness.net ([74.95.45.185]
	helo=localhost) by youngberry.canonical.com with esmtpsa
	(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71)
	(envelope-from <colin.king@canonical.com>) id 1SqpjG-0005sn-M2
	for fwts-devel@lists.ubuntu.com; Mon, 16 Jul 2012 18:09:07 +0000
From: Colin King <colin.king@canonical.com>
To: fwts-devel@lists.ubuntu.com
Subject: [PATCH 1/2] Add mutex around semaphore counting (LP:#1017388)
Date: Mon, 16 Jul 2012 11:08:59 -0700
Message-Id: <1342462140-16674-2-git-send-email-colin.king@canonical.com>
X-Mailer: git-send-email 1.7.10.4
In-Reply-To: <1342462140-16674-1-git-send-email-colin.king@canonical.com>
References: <1342462140-16674-1-git-send-email-colin.king@canonical.com>
X-BeenThere: fwts-devel@lists.ubuntu.com
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: Firmware Test Suite Development <fwts-devel.lists.ubuntu.com>
List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/fwts-devel>,
	<mailto:fwts-devel-request@lists.ubuntu.com?subject=unsubscribe>
List-Archive: <https://lists.ubuntu.com/archives/fwts-devel>
List-Post: <mailto:fwts-devel@lists.ubuntu.com>
List-Help: <mailto:fwts-devel-request@lists.ubuntu.com?subject=help>
List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/fwts-devel>,
	<mailto:fwts-devel-request@lists.ubuntu.com?subject=subscribe>
MIME-Version: 1.0
Sender: fwts-devel-bounces@lists.ubuntu.com
Errors-To: fwts-devel-bounces@lists.ubuntu.com

From: Colin Ian King <colin.king@canonical.com>

The ACPICA core can execute control methods in a non
serialized manner, so we should add a mutex lock around
the semaphore counting mechanism to remove any race
conditions.  This fixes bug LP:#1017388

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Ivan Hu<ivan.hu@canonical.com>
Acked-by: Alex Hung <alex.hung@canonical.com>
---
 src/acpica/fwts_acpica.c |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/acpica/fwts_acpica.c b/src/acpica/fwts_acpica.c
index b8119cb..cf9a4fe 100644
--- a/src/acpica/fwts_acpica.c
+++ b/src/acpica/fwts_acpica.c
@@ -29,6 +29,9 @@
 #include <errno.h>
 #include <semaphore.h>
 #include <signal.h>
+#include <pthread.h>
+
+static pthread_mutex_t mutex_lock_count;
 
 #include "fwts.h"
 
@@ -109,10 +112,14 @@ void fwts_acpica_sem_count_clear(void)
 {
 	int i;
 
+	pthread_mutex_lock(&mutex_lock_count);
+
 	for (i=0;i<MAX_SEMAPHORES;i++) {
 		sem_hash_table[i].sem = NULL;
 		sem_hash_table[i].count = 0;
 	}
+
+	pthread_mutex_unlock(&mutex_lock_count);
 }
 
 /*
@@ -171,9 +178,12 @@ static unsigned int hash_sem_handle(sem_t *sem)
 static void hash_sem_inc_count(sem_t *sem)
 {
 	unsigned int i = hash_sem_handle(sem);
+
 	if (i != HASH_FULL) {
+		pthread_mutex_lock(&mutex_lock_count);
 		sem_hash_table[i].sem = sem;
 		sem_hash_table[i].count++;
+		pthread_mutex_unlock(&mutex_lock_count);
 	}
 }
 
@@ -184,9 +194,12 @@ static void hash_sem_inc_count(sem_t *sem)
 static void hash_sem_dec_count(sem_t *sem)
 {
 	unsigned int i = hash_sem_handle(sem);
+
 	if (i != HASH_FULL) {
+		pthread_mutex_lock(&mutex_lock_count);
 		sem_hash_table[i].sem = sem;
 		sem_hash_table[i].count--;
+		pthread_mutex_unlock(&mutex_lock_count);
 	}
 }
 
@@ -788,6 +801,8 @@ int fwts_acpica_init(fwts_framework *fw)
 	if (fwts_acpica_init_called)
 		return FWTS_ERROR;
 
+	pthread_mutex_init(&mutex_lock_count, NULL);
+
 	fwts_acpica_fw = fw;
 
 	AcpiDbgLevel = ACPI_NORMAL_DEFAULT;
@@ -974,6 +989,7 @@ int fwts_acpica_deinit(void)
 		return FWTS_ERROR;
 
 	AcpiTerminate();
+	pthread_mutex_destroy(&mutex_lock_count);
 
 	FWTS_ACPICA_FREE(fwts_acpica_XSDT);
 	FWTS_ACPICA_FREE(fwts_acpica_RSDT);