diff -Nru fwts-14.03.01/debian/changelog fwts-14.03.01/debian/changelog --- fwts-14.03.01/debian/changelog 2016-01-04 09:26:02.000000000 +0000 +++ fwts-14.03.01/debian/changelog 2016-10-24 17:16:31.000000000 +0000 @@ -1,3 +1,11 @@ +fwts (14.03.01-0ubuntu4) trusty; urgency=low + + * fix segment fault when running fwts method test (LP: #1635502) + - remove double pthread_mutex_unlock on method usage thread counter + * minor wiggle of patches in debian/patches + + -- Colin King Mon, 24 Oct 2016 18:05:14 +0100 + fwts (14.03.01-0ubuntu3) trusty; urgency=low * pci: aspm: check that a table exists, fixes segv on ppc64le (LP: #1527460) diff -Nru fwts-14.03.01/debian/patches/0002-acpi-pcc-fwts_mmap-failure-is-FWTS_MAP_FAILED-and-no.patch fwts-14.03.01/debian/patches/0002-acpi-pcc-fwts_mmap-failure-is-FWTS_MAP_FAILED-and-no.patch --- fwts-14.03.01/debian/patches/0002-acpi-pcc-fwts_mmap-failure-is-FWTS_MAP_FAILED-and-no.patch 2016-01-04 09:26:02.000000000 +0000 +++ fwts-14.03.01/debian/patches/0002-acpi-pcc-fwts_mmap-failure-is-FWTS_MAP_FAILED-and-no.patch 2016-10-24 17:07:59.000000000 +0000 @@ -12,11 +12,11 @@ src/acpi/pcc/pcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/acpi/pcc/pcc.c b/src/acpi/pcc/pcc.c -index da66aec..799e773 100644 ---- a/src/acpi/pcc/pcc.c -+++ b/src/acpi/pcc/pcc.c -@@ -110,7 +110,7 @@ static void pcc_check_pcc_header( +Index: fwts-14.03.01/src/acpi/pcc/pcc.c +=================================================================== +--- fwts-14.03.01.orig/src/acpi/pcc/pcc.c 2016-10-24 17:07:54.570655925 +0000 ++++ fwts-14.03.01/src/acpi/pcc/pcc.c 2016-10-24 17:07:54.562655930 +0000 +@@ -113,7 +113,7 @@ fwts_pcc_header *hdr; hdr = (fwts_pcc_header *)fwts_mmap((off_t)addr, (size_t)length); @@ -25,6 +25,3 @@ fwts_log_info(fw, "Failed to memory map PCC header 0x%" PRIx64 "..0x%" PRIx64 ".", addr, addr + length); return; --- -2.6.4 - diff -Nru fwts-14.03.01/debian/patches/0004-fwts_acpica-fix-segmentation-fault-by-unlock-mutex-t.patch fwts-14.03.01/debian/patches/0004-fwts_acpica-fix-segmentation-fault-by-unlock-mutex-t.patch --- fwts-14.03.01/debian/patches/0004-fwts_acpica-fix-segmentation-fault-by-unlock-mutex-t.patch 1970-01-01 00:00:00.000000000 +0000 +++ fwts-14.03.01/debian/patches/0004-fwts_acpica-fix-segmentation-fault-by-unlock-mutex-t.patch 2016-10-24 17:07:28.000000000 +0000 @@ -0,0 +1,43 @@ +From b298eb7dad16561a23d846181917c5f90148fc82 Mon Sep 17 00:00:00 2001 +From: Ivan Hu +Date: Fri, 21 Oct 2016 11:39:44 +0800 +Subject: [PATCH] fwts_acpica: fix segmentation fault by unlock mutex twice + (LP: #1635502) +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +fix the pthread_mutex_unlock twice cause segment fault +Test 46 of 192: Test _OFF (Set resource off). +PASSED: Test 46, \_SB_.PCI0.PEG0.PEGP._OFF returned no values as expected. +Caught SIGNAL 11 (Segmentation fault), aborting. +Backtrace: +0x00007f09c3fc9dd4 /usr/local/lib/fwts/libfwts.so.1(+0xfdd4) +0x00007f09c3a1b4a0 /lib/x86_64-linux-gnu/libc.so.6(+0x354a0) +0x00007f09c3363960 /lib/x86_64-linux-gnu/libpthread.so.0(+0x12960) +0x00007f09c42196b0 /usr/local/lib/fwts/libfwtsacpica.so.1(fwts_acpica_sem_count_get+0x40) +0x000000000041efef fwts() +0x000000000041f195 fwts() +0x0000000000421210 fwts() +0x00007f09c3fcf441 /usr/local/lib/fwts/libfwts.so.1(+0x15441) +0x00007f09c3fd0bc3 /usr/local/lib/fwts/libfwts.so.1(fwts_framework_args+0x793) +0x000000000040519a fwts() +0x00007f09c3a06830 /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf0) +0x0000000000406079 fwts() + +Signed-off-by: Ivan Hu +--- + src/acpica/fwts_acpica.c | 1 - + 1 file changed, 1 deletion(-) + +Index: fwts-14.03.01/src/acpica/fwts_acpica.c +=================================================================== +--- fwts-14.03.01.orig/src/acpica/fwts_acpica.c 2016-10-24 17:07:23.734672853 +0000 ++++ fwts-14.03.01/src/acpica/fwts_acpica.c 2016-10-24 17:07:23.734672853 +0000 +@@ -140,7 +140,6 @@ + + pthread_mutex_lock(&mutex_thread_info); + threads[i].used = false; +- pthread_mutex_unlock(&mutex_thread_info); + } + pthread_mutex_unlock(&mutex_thread_info); + } diff -Nru fwts-14.03.01/debian/patches/series fwts-14.03.01/debian/patches/series --- fwts-14.03.01/debian/patches/series 2016-01-04 09:26:02.000000000 +0000 +++ fwts-14.03.01/debian/patches/series 2016-10-24 17:04:09.000000000 +0000 @@ -1,3 +1,4 @@ 0001-pci-aspm-check-that-a-table-exists-fixes-segv-on-arm.patch 0002-acpi-pcc-fwts_mmap-failure-is-FWTS_MAP_FAILED-and-no.patch 0003-bios-ebdadump-fwts_mmap-failure-is-FWTS_MAP_FAILED-a.patch +0004-fwts_acpica-fix-segmentation-fault-by-unlock-mutex-t.patch