rpms/acpica-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 20180313 sources and refresh patches.

Browse Source 
Signed-off-by: Al Stone <ahs3@redhat.com>
This commit is contained in:
Al Stone 2018-05-14 12:57:53 -06:00
parent 0476e03516
commit 9ce02383aa
9 changed files with 237 additions and 241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -87,3 +87,5 @@ series
/acpitests-unix-20180105.tar.gz
/acpica-unix2-20180209.tar.gz
/acpitests-unix-20180209.tar.gz
/acpica-unix2-20180313.tar.gz
/acpitests-unix-20180313.tar.gz

5
acpica-tools.spec
View File

@ -1,5 +1,5 @@
Name: acpica-tools
Version: 20180209
Version: 20180313
Release: 1%{?dist}
Summary: ACPICA tools for the development and debug of ACPI tables
@ -238,6 +238,9 @@ fi
%changelog
* Mon May 14 2018 Al Stone <ahs3@redhat.com> - 20180313-1
- Update to 20180209 source tree, including patch refeshes. Closes BZ#1544048
* Fri Mar 16 2018 Al Stone <ahs3@redhat.com> - 20180209-1
- Update to 20180209 source tree, including patch refeshes. Closes BZ#1544048
- CVE-2017-13693: operand cache leak in dsutils.c -- applied github patch to

306
big-endian.patch
View File

@ -23,10 +23,10 @@ Signed-off-by: Al Stone <ahs3@redhat.com>
source/include/platform/aclinux.h | 8 ++
12 files changed, 487 insertions(+), 283 deletions(-)
Index: acpica-unix2-20180209/source/compiler/aslcodegen.c
Index: acpica-unix-20180313/source/compiler/aslcodegen.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslcodegen.c
+++ acpica-unix2-20180209/source/compiler/aslcodegen.c
--- acpica-unix-20180313.orig/source/compiler/aslcodegen.c
+++ acpica-unix-20180313/source/compiler/aslcodegen.c
@@ -240,16 +240,12 @@ CgWriteAmlOpcode (
ACPI_PARSE_OBJECT *Op)
{
@ -268,10 +268,10 @@ Index: acpica-unix2-20180209/source/compiler/aslcodegen.c
case AML_RAW_DATA_BUFFER:
Index: acpica-unix2-20180209/source/compiler/aslopcodes.c
Index: acpica-unix-20180313/source/compiler/aslopcodes.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslopcodes.c
+++ acpica-unix2-20180209/source/compiler/aslopcodes.c
--- acpica-unix-20180313.orig/source/compiler/aslopcodes.c
+++ acpica-unix-20180313/source/compiler/aslopcodes.c
@@ -485,6 +485,7 @@ OpcDoUnicode (
UINT32 i;
UINT8 *AsciiString;
@ -290,10 +290,10 @@ Index: acpica-unix2-20180209/source/compiler/aslopcodes.c
}
/*
Index: acpica-unix2-20180209/source/compiler/aslrestype1.c
Index: acpica-unix-20180313/source/compiler/aslrestype1.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype1.c
+++ acpica-unix2-20180209/source/compiler/aslrestype1.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype1.c
+++ acpica-unix-20180313/source/compiler/aslrestype1.c
@@ -142,6 +142,11 @@ RsDoMemory24Descriptor (
ACPI_PARSE_OBJECT *LengthOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -490,10 +490,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype1.c
RsCreateDwordField (InitializerOp, ACPI_RESTAG_LENGTH,
CurrentByteOffset + ASL_RESDESC_OFFSET (FixedMemory32.AddressLength));
break;
Index: acpica-unix2-20180209/source/compiler/aslrestype1i.c
Index: acpica-unix-20180313/source/compiler/aslrestype1i.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype1i.c
+++ acpica-unix2-20180209/source/compiler/aslrestype1i.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype1i.c
+++ acpica-unix-20180313/source/compiler/aslrestype1i.c
@@ -198,6 +198,8 @@ RsDoFixedDmaDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -630,10 +630,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype1i.c
+ ACPI_MOVE_16_TO_16(&Descriptor->Irq.IrqMask, &IrqMask);
return (Rnode);
}
Index: acpica-unix2-20180209/source/compiler/aslrestype2.c
Index: acpica-unix-20180313/source/compiler/aslrestype2.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype2.c
+++ acpica-unix2-20180209/source/compiler/aslrestype2.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype2.c
+++ acpica-unix-20180313/source/compiler/aslrestype2.c
@@ -76,6 +76,7 @@ RsDoGeneralRegisterDescriptor (
ACPI_PARSE_OBJECT *InitializerOp;
ASL_RESOURCE_NODE *Rnode;
@ -774,10 +774,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype2.c
/* Point to end-of-descriptor for vendor data */
Index: acpica-unix2-20180209/source/compiler/aslrestype2d.c
Index: acpica-unix-20180313/source/compiler/aslrestype2d.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype2d.c
+++ acpica-unix2-20180209/source/compiler/aslrestype2d.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype2d.c
+++ acpica-unix-20180313/source/compiler/aslrestype2d.c
@@ -79,7 +79,13 @@ RsDoDwordIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1133,10 +1133,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype2d.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS32) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20180209/source/compiler/aslrestype2e.c
Index: acpica-unix-20180313/source/compiler/aslrestype2e.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype2e.c
+++ acpica-unix2-20180209/source/compiler/aslrestype2e.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype2e.c
+++ acpica-unix-20180313/source/compiler/aslrestype2e.c
@@ -78,6 +78,13 @@ RsDoExtendedIoDescriptor (
ACPI_PARSE_OBJECT *GranOp = NULL;
ASL_RESOURCE_NODE *Rnode;
@ -1242,10 +1242,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype2e.c
Rnode->BufferLength = sizeof (AML_RESOURCE_EXTENDED_ADDRESS64) +
StringLength;
return (Rnode);
Index: acpica-unix2-20180209/source/compiler/aslrestype2q.c
Index: acpica-unix-20180313/source/compiler/aslrestype2q.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype2q.c
+++ acpica-unix2-20180209/source/compiler/aslrestype2q.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype2q.c
+++ acpica-unix-20180313/source/compiler/aslrestype2q.c
@@ -80,7 +80,13 @@ RsDoQwordIoDescriptor (
ASL_RESOURCE_NODE *Rnode;
UINT8 *OptionalFields;
@ -1584,10 +1584,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype2q.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS64) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20180209/source/compiler/aslrestype2s.c
Index: acpica-unix-20180313/source/compiler/aslrestype2s.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype2s.c
+++ acpica-unix2-20180209/source/compiler/aslrestype2s.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype2s.c
+++ acpica-unix-20180313/source/compiler/aslrestype2s.c
@@ -340,9 +340,14 @@ RsDoGpioIntDescriptor (
UINT16 VendorLength;
UINT16 InterruptLength;
@ -2053,10 +2053,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype2s.c
MpSaveSerialInfo (Info->MappingOp, Descriptor, ResourceSource);
return (Rnode);
}
Index: acpica-unix2-20180209/source/compiler/aslrestype2w.c
Index: acpica-unix-20180313/source/compiler/aslrestype2w.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslrestype2w.c
+++ acpica-unix2-20180209/source/compiler/aslrestype2w.c
--- acpica-unix-20180313.orig/source/compiler/aslrestype2w.c
+++ acpica-unix-20180313/source/compiler/aslrestype2w.c
@@ -81,6 +81,12 @@ RsDoWordIoDescriptor (
UINT8 *OptionalFields;
UINT16 StringLength = 0;
@ -2400,10 +2400,10 @@ Index: acpica-unix2-20180209/source/compiler/aslrestype2w.c
Rnode->BufferLength = sizeof (AML_RESOURCE_ADDRESS16) +
OptionIndex + StringLength;
return (Rnode);
Index: acpica-unix2-20180209/source/include/acmacros.h
Index: acpica-unix-20180313/source/include/acmacros.h
===================================================================
--- acpica-unix2-20180209.orig/source/include/acmacros.h
+++ acpica-unix2-20180209/source/include/acmacros.h
--- acpica-unix-20180313.orig/source/include/acmacros.h
+++ acpica-unix-20180313/source/include/acmacros.h
@@ -98,9 +98,12 @@
((UINT8 *)(void *)(d))[6] = ((UINT8 *)(void *)(s))[1];\
((UINT8 *)(void *)(d))[7] = ((UINT8 *)(void *)(s))[0];}
@ -2482,11 +2482,11 @@ Index: acpica-unix2-20180209/source/include/acmacros.h
#define ACPI_MOVE_32_TO_16(d, s) ACPI_MOVE_16_TO_16(d, s) /* Truncate to 16 */
Index: acpica-unix2-20180209/source/include/platform/aclinux.h
Index: acpica-unix-20180313/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20180209.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180209/source/include/platform/aclinux.h
@@ -192,6 +192,7 @@
--- acpica-unix-20180313.orig/source/include/platform/aclinux.h
+++ acpica-unix-20180313/source/include/platform/aclinux.h
@@ -193,6 +193,7 @@
#ifdef ACPI_USE_STANDARD_HEADERS
#include <unistd.h>
@ -2494,7 +2494,7 @@ Index: acpica-unix2-20180209/source/include/platform/aclinux.h
#endif
/* Define/disable kernel-specific declarators */
@@ -226,6 +227,10 @@
@@ -227,6 +228,10 @@
#define __cdecl
#endif
@ -2505,10 +2505,10 @@ Index: acpica-unix2-20180209/source/include/platform/aclinux.h
#endif /* __KERNEL__ */
#endif /* __ACLINUX_H__ */
Index: acpica-unix2-20180209/source/compiler/aslanalyze.c
Index: acpica-unix-20180313/source/compiler/aslanalyze.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslanalyze.c
+++ acpica-unix2-20180209/source/compiler/aslanalyze.c
--- acpica-unix-20180313.orig/source/compiler/aslanalyze.c
+++ acpica-unix-20180313/source/compiler/aslanalyze.c
@@ -461,7 +461,7 @@ ApCheckForGpeNameConflict (
/* Need a null-terminated string version of NameSeg */
@ -2527,10 +2527,10 @@ Index: acpica-unix2-20180209/source/compiler/aslanalyze.c
/* Inject opposite letter ("L" versus "E") */
Index: acpica-unix2-20180209/source/compiler/asllookup.c
Index: acpica-unix-20180313/source/compiler/asllookup.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/asllookup.c
+++ acpica-unix2-20180209/source/compiler/asllookup.c
--- acpica-unix-20180313.orig/source/compiler/asllookup.c
+++ acpica-unix-20180313/source/compiler/asllookup.c
@@ -119,6 +119,7 @@ LkIsObjectUsed (
{
ACPI_NAMESPACE_NODE *Node = ACPI_CAST_PTR (ACPI_NAMESPACE_NODE, ObjHandle);
@ -2561,10 +2561,10 @@ Index: acpica-unix2-20180209/source/compiler/asllookup.c
AslError (ASL_REMARK, ASL_MSG_NOT_REFERENCED,
LkGetNameOp (Node->Op), MsgBuffer);
return (AE_OK);
Index: acpica-unix2-20180209/source/compiler/aslmain.c
Index: acpica-unix-20180313/source/compiler/aslmain.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslmain.c
+++ acpica-unix2-20180209/source/compiler/aslmain.c
--- acpica-unix-20180313.orig/source/compiler/aslmain.c
+++ acpica-unix-20180313/source/compiler/aslmain.c
@@ -102,18 +102,6 @@ main (
signal (SIGINT, AslSignalHandler);
signal (SIGSEGV, AslSignalHandler);
@ -2584,10 +2584,10 @@ Index: acpica-unix2-20180209/source/compiler/aslmain.c
AcpiOsInitialize ();
ACPI_DEBUG_INITIALIZE (); /* For debug version only */
Index: acpica-unix2-20180209/source/common/acfileio.c
Index: acpica-unix-20180313/source/common/acfileio.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/acfileio.c
+++ acpica-unix2-20180209/source/common/acfileio.c
--- acpica-unix-20180313.orig/source/common/acfileio.c
+++ acpica-unix-20180313/source/common/acfileio.c
@@ -280,6 +280,7 @@ AcGetOneTableFromFile (
ACPI_TABLE_HEADER *Table;
INT32 Count;
@ -2649,10 +2649,10 @@ Index: acpica-unix2-20180209/source/common/acfileio.c
(UINT32) (FileSize - TableOffset));
return (AE_BAD_HEADER);
}
Index: acpica-unix2-20180209/source/common/dmtable.c
Index: acpica-unix-20180313/source/common/dmtable.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmtable.c
+++ acpica-unix2-20180209/source/common/dmtable.c
--- acpica-unix-20180313.orig/source/common/dmtable.c
+++ acpica-unix-20180313/source/common/dmtable.c
@@ -550,7 +550,7 @@ AcpiDmDumpDataTable (
*/
if (ACPI_COMPARE_NAME (Table->Signature, ACPI_SIG_FACS))
@ -2751,10 +2751,10 @@ Index: acpica-unix2-20180209/source/common/dmtable.c
AcpiDmNfitSubnames[Temp16]);
break;
Index: acpica-unix2-20180209/source/common/dmtables.c
Index: acpica-unix-20180313/source/common/dmtables.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmtables.c
+++ acpica-unix2-20180209/source/common/dmtables.c
--- acpica-unix-20180313.orig/source/common/dmtables.c
+++ acpica-unix-20180313/source/common/dmtables.c
@@ -142,7 +142,9 @@ AdCreateTableHeader (
ACPI_TABLE_HEADER *Table)
{
@ -2820,10 +2820,10 @@ Index: acpica-unix2-20180209/source/common/dmtables.c
AmlStart = ((UINT8 *) Table + sizeof (ACPI_TABLE_HEADER));
ASL_CV_INIT_FILETREE(Table, AmlStart, AmlLength);
Index: acpica-unix2-20180209/source/common/dmtbdump.c
Index: acpica-unix-20180313/source/common/dmtbdump.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmtbdump.c
+++ acpica-unix2-20180209/source/common/dmtbdump.c
--- acpica-unix-20180313.orig/source/common/dmtbdump.c
+++ acpica-unix-20180313/source/common/dmtbdump.c
@@ -277,6 +277,8 @@ AcpiDmDumpRsdt (
UINT32 Entries;
UINT32 Offset;
@ -2982,10 +2982,10 @@ Index: acpica-unix2-20180209/source/common/dmtbdump.c
- Revision, Length, ExpectedLength);
+ Revision, Tmp32, ExpectedLength);
}
Index: acpica-unix2-20180209/source/common/dmtbdump1.c
Index: acpica-unix-20180313/source/common/dmtbdump1.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmtbdump1.c
+++ acpica-unix2-20180209/source/common/dmtbdump1.c
--- acpica-unix-20180313.orig/source/common/dmtbdump1.c
+++ acpica-unix-20180313/source/common/dmtbdump1.c
@@ -79,17 +79,21 @@ AcpiDmDumpAsf (
UINT32 DataOffset = 0;
UINT32 i;
@ -3619,10 +3619,10 @@ Index: acpica-unix2-20180209/source/common/dmtbdump1.c
{
case ACPI_HEST_TYPE_IA32_CHECK:
Index: acpica-unix2-20180209/source/common/dmtbdump2.c
Index: acpica-unix-20180313/source/common/dmtbdump2.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmtbdump2.c
+++ acpica-unix2-20180209/source/common/dmtbdump2.c
--- acpica-unix-20180313.orig/source/common/dmtbdump2.c
+++ acpica-unix-20180313/source/common/dmtbdump2.c
@@ -75,15 +75,21 @@ AcpiDmDumpIort (
ACPI_IORT_SMMU *IortSmmu = NULL;
UINT32 Offset;
@ -4505,10 +4505,10 @@ Index: acpica-unix2-20180209/source/common/dmtbdump2.c
Subtable->Length, InfoTable);
if (ACPI_FAILURE (Status))
{
Index: acpica-unix2-20180209/source/common/dmtbdump3.c
Index: acpica-unix-20180313/source/common/dmtbdump3.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmtbdump3.c
+++ acpica-unix2-20180209/source/common/dmtbdump3.c
--- acpica-unix-20180313.orig/source/common/dmtbdump3.c
+++ acpica-unix-20180313/source/common/dmtbdump3.c
@@ -68,9 +68,11 @@ void
AcpiDmDumpSlic (
ACPI_TABLE_HEADER *Table)
@ -4755,10 +4755,10 @@ Index: acpica-unix2-20180209/source/common/dmtbdump3.c
+ (void) AcpiDmDumpTable (Length, 0, Table, ArgumentsLength,
AcpiDmTableInfoWpbt0);
}
Index: acpica-unix2-20180209/source/compiler/dtfield.c
Index: acpica-unix-20180313/source/compiler/dtfield.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/dtfield.c
+++ acpica-unix2-20180209/source/compiler/dtfield.c
--- acpica-unix-20180313.orig/source/compiler/dtfield.c
+++ acpica-unix-20180313/source/compiler/dtfield.c
@@ -359,7 +359,27 @@ DtCompileInteger (
DtError (ASL_ERROR, ASL_MSG_INTEGER_SIZE, Field, MsgBuffer);
}
@ -4788,10 +4788,10 @@ Index: acpica-unix2-20180209/source/compiler/dtfield.c
return;
}
Index: acpica-unix2-20180209/source/compiler/dtsubtable.c
Index: acpica-unix-20180313/source/compiler/dtsubtable.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/dtsubtable.c
+++ acpica-unix2-20180209/source/compiler/dtsubtable.c
--- acpica-unix-20180313.orig/source/compiler/dtsubtable.c
+++ acpica-unix-20180313/source/compiler/dtsubtable.c
@@ -378,6 +378,21 @@ DtSetSubtableLength (
return;
}
@ -4816,10 +4816,10 @@ Index: acpica-unix2-20180209/source/compiler/dtsubtable.c
+ Subtable->SizeOfLengthField);
+ }
}
Index: acpica-unix2-20180209/source/compiler/dttable1.c
Index: acpica-unix-20180313/source/compiler/dttable1.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/dttable1.c
+++ acpica-unix2-20180209/source/compiler/dttable1.c
--- acpica-unix-20180313.orig/source/compiler/dttable1.c
+++ acpica-unix-20180313/source/compiler/dttable1.c
@@ -281,6 +281,8 @@ DtCompileCsrt (
DT_FIELD **PFieldList = (DT_FIELD **) List;
UINT32 DescriptorCount;
@ -5191,10 +5191,10 @@ Index: acpica-unix2-20180209/source/compiler/dttable1.c
return (AE_OK);
}
Index: acpica-unix2-20180209/source/compiler/dttable2.c
Index: acpica-unix-20180313/source/compiler/dttable2.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/dttable2.c
+++ acpica-unix2-20180209/source/compiler/dttable2.c
--- acpica-unix-20180313.orig/source/compiler/dttable2.c
+++ acpica-unix-20180313/source/compiler/dttable2.c
@@ -345,7 +345,7 @@ DtCompileMpst (
DtPushSubtable (Subtable);
@ -5351,10 +5351,10 @@ Index: acpica-unix2-20180209/source/compiler/dttable2.c
ParentTable = DtPeekSubtable ();
DtInsertSubtable (ParentTable, Subtable);
Index: acpica-unix2-20180209/source/components/disassembler/dmbuffer.c
Index: acpica-unix-20180313/source/components/disassembler/dmbuffer.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix2-20180209/source/components/disassembler/dmbuffer.c
--- acpica-unix-20180313.orig/source/components/disassembler/dmbuffer.c
+++ acpica-unix-20180313/source/components/disassembler/dmbuffer.c
@@ -204,7 +204,7 @@ AcpiDmByteList (
@ -5430,10 +5430,10 @@ Index: acpica-unix2-20180209/source/components/disassembler/dmbuffer.c
NextOp = AcpiPsGetDepthNext (NULL, Op);
if (!NextOp)
Index: acpica-unix2-20180209/source/components/disassembler/dmopcode.c
Index: acpica-unix-20180313/source/components/disassembler/dmopcode.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix2-20180209/source/components/disassembler/dmopcode.c
--- acpica-unix-20180313.orig/source/components/disassembler/dmopcode.c
+++ acpica-unix-20180313/source/components/disassembler/dmopcode.c
@@ -244,6 +244,7 @@ AcpiDmPredefinedDescription (
char *NameString;
int LastCharIsDigit;
@ -5504,10 +5504,10 @@ Index: acpica-unix2-20180209/source/components/disassembler/dmopcode.c
Info->Level += 1;
Info->MappingOp = Op;
Index: acpica-unix2-20180209/source/components/disassembler/dmresrcl.c
Index: acpica-unix-20180313/source/components/disassembler/dmresrcl.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix2-20180209/source/components/disassembler/dmresrcl.c
--- acpica-unix-20180313.orig/source/components/disassembler/dmresrcl.c
+++ acpica-unix-20180313/source/components/disassembler/dmresrcl.c
@@ -141,7 +141,8 @@ AcpiDmMemoryFields (
UINT32 Level)
{
@ -5656,10 +5656,10 @@ Index: acpica-unix2-20180209/source/components/disassembler/dmresrcl.c
}
AcpiDmIndent (Level);
Index: acpica-unix2-20180209/source/components/disassembler/dmresrcl2.c
Index: acpica-unix-20180313/source/components/disassembler/dmresrcl2.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix2-20180209/source/components/disassembler/dmresrcl2.c
--- acpica-unix-20180313.orig/source/components/disassembler/dmresrcl2.c
+++ acpica-unix-20180313/source/components/disassembler/dmresrcl2.c
@@ -191,22 +191,24 @@ AcpiDmGpioCommon (
char *DeviceName = NULL;
UINT32 PinCount;
@ -5883,10 +5883,10 @@ Index: acpica-unix2-20180209/source/components/disassembler/dmresrcl2.c
DeviceName = ACPI_ADD_PTR (char, Resource, ResourceSourceOffset);
AcpiUtPrintString (DeviceName, ACPI_UINT16_MAX);
Index: acpica-unix2-20180209/source/components/disassembler/dmresrcs.c
Index: acpica-unix-20180313/source/components/disassembler/dmresrcs.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix2-20180209/source/components/disassembler/dmresrcs.c
--- acpica-unix-20180313.orig/source/components/disassembler/dmresrcs.c
+++ acpica-unix-20180313/source/components/disassembler/dmresrcs.c
@@ -72,6 +72,7 @@ AcpiDmIrqDescriptor (
UINT32 Length,
UINT32 Level)
@ -5943,10 +5943,10 @@ Index: acpica-unix2-20180209/source/components/disassembler/dmresrcs.c
AcpiDmIndent (Level + 1);
AcpiDmDumpInteger8 (Resource->FixedIo.AddressLength, "Length");
Index: acpica-unix2-20180209/source/components/dispatcher/dsfield.c
Index: acpica-unix-20180313/source/components/dispatcher/dsfield.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix2-20180209/source/components/dispatcher/dsfield.c
--- acpica-unix-20180313.orig/source/components/dispatcher/dsfield.c
+++ acpica-unix-20180313/source/components/dispatcher/dsfield.c
@@ -321,6 +321,7 @@ AcpiDsGetFieldNames (
ACPI_STATUS Status;
UINT64 Position;
@ -5991,10 +5991,10 @@ Index: acpica-unix2-20180209/source/components/dispatcher/dsfield.c
if (ACPI_FAILURE (Status))
{
ACPI_ERROR_NAMESPACE (WalkState->ScopeInfo,
Index: acpica-unix2-20180209/source/components/events/evgpeblk.c
Index: acpica-unix-20180313/source/components/events/evgpeblk.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/events/evgpeblk.c
+++ acpica-unix2-20180209/source/components/events/evgpeblk.c
--- acpica-unix-20180313.orig/source/components/events/evgpeblk.c
+++ acpica-unix-20180313/source/components/events/evgpeblk.c
@@ -376,6 +376,7 @@ AcpiEvCreateGpeBlock (
ACPI_STATUS Status;
ACPI_GPE_BLOCK_INFO *GpeBlock;
@ -6027,10 +6027,10 @@ Index: acpica-unix2-20180209/source/components/events/evgpeblk.c
InterruptNumber == AcpiGbl_FADT.SciInterrupt ? " (SCI)" : ""));
/* Update global count of currently available GPEs */
Index: acpica-unix2-20180209/source/components/hardware/hwregs.c
Index: acpica-unix-20180313/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20180209/source/components/hardware/hwregs.c
--- acpica-unix-20180313.orig/source/components/hardware/hwregs.c
+++ acpica-unix-20180313/source/components/hardware/hwregs.c
@@ -197,7 +197,7 @@ AcpiHwValidateRegister (
* Address must not be null. A null address also indicates an optional
* ACPI register that is not supported, so no error message.
@ -6040,10 +6040,10 @@ Index: acpica-unix2-20180209/source/components/hardware/hwregs.c
if (!(*Address))
{
return (AE_BAD_ADDRESS);
Index: acpica-unix2-20180209/source/components/hardware/hwvalid.c
Index: acpica-unix-20180313/source/components/hardware/hwvalid.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/hardware/hwvalid.c
+++ acpica-unix2-20180209/source/components/hardware/hwvalid.c
--- acpica-unix-20180313.orig/source/components/hardware/hwvalid.c
+++ acpica-unix-20180313/source/components/hardware/hwvalid.c
@@ -135,6 +135,8 @@ AcpiHwValidateIoRequest (
UINT32 ByteWidth;
ACPI_IO_ADDRESS LastAddress;
@ -6065,10 +6065,10 @@ Index: acpica-unix2-20180209/source/components/hardware/hwvalid.c
{
ACPI_ERROR ((AE_INFO,
"Illegal I/O port address/length above 64K: %8.8X%8.8X/0x%X",
Index: acpica-unix2-20180209/source/components/namespace/nsaccess.c
Index: acpica-unix-20180313/source/components/namespace/nsaccess.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/namespace/nsaccess.c
+++ acpica-unix2-20180209/source/components/namespace/nsaccess.c
--- acpica-unix-20180313.orig/source/components/namespace/nsaccess.c
+++ acpica-unix-20180313/source/components/namespace/nsaccess.c
@@ -313,6 +313,7 @@ AcpiNsLookup (
ACPI_OBJECT_TYPE ThisSearchType;
UINT32 SearchParentFlag = ACPI_NS_SEARCH_PARENT;
@ -6089,11 +6089,11 @@ Index: acpica-unix2-20180209/source/components/namespace/nsaccess.c
AcpiUtGetTypeName (ThisNode->Type),
AcpiUtGetTypeName (TypeToCheckFor)));
}
Index: acpica-unix2-20180209/source/components/namespace/nsparse.c
Index: acpica-unix-20180313/source/components/namespace/nsparse.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/namespace/nsparse.c
+++ acpica-unix2-20180209/source/components/namespace/nsparse.c
@@ -197,13 +197,14 @@ AcpiNsOneCompleteParse (
--- acpica-unix-20180313.orig/source/components/namespace/nsparse.c
+++ acpica-unix-20180313/source/components/namespace/nsparse.c
@@ -206,13 +206,14 @@ AcpiNsOneCompleteParse (
/* Table must consist of at least a complete header */
@ -6110,10 +6110,10 @@ Index: acpica-unix2-20180209/source/components/namespace/nsparse.c
Status = AcpiTbGetOwnerId (TableIndex, &OwnerId);
if (ACPI_FAILURE (Status))
Index: acpica-unix2-20180209/source/components/tables/tbdata.c
Index: acpica-unix-20180313/source/components/tables/tbdata.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbdata.c
+++ acpica-unix2-20180209/source/components/tables/tbdata.c
--- acpica-unix-20180313.orig/source/components/tables/tbdata.c
+++ acpica-unix-20180313/source/components/tables/tbdata.c
@@ -552,6 +552,7 @@ AcpiTbVerifyTempTable (
UINT32 *TableIndex)
{
@ -6132,10 +6132,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbdata.c
if (ACPI_FAILURE (Status))
{
ACPI_EXCEPTION ((AE_INFO, AE_NO_MEMORY,
Index: acpica-unix2-20180209/source/components/tables/tbfadt.c
Index: acpica-unix-20180313/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20180209/source/components/tables/tbfadt.c
--- acpica-unix-20180313.orig/source/components/tables/tbfadt.c
+++ acpica-unix-20180313/source/components/tables/tbfadt.c
@@ -424,18 +424,20 @@ AcpiTbCreateLocalFadt (
ACPI_TABLE_HEADER *Table,
UINT32 Length)
@ -6247,10 +6247,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbfadt.c
"PmRegisters", 0);
}
}
Index: acpica-unix2-20180209/source/components/tables/tbfind.c
Index: acpica-unix-20180313/source/components/tables/tbfind.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbfind.c
+++ acpica-unix2-20180209/source/components/tables/tbfind.c
--- acpica-unix-20180313.orig/source/components/tables/tbfind.c
+++ acpica-unix-20180313/source/components/tables/tbfind.c
@@ -108,8 +108,11 @@ AcpiTbFindTable (
(void) AcpiUtAcquireMutex (ACPI_MTX_TABLES);
for (i = 0; i < AcpiGbl_RootTableList.CurrentTableCount; ++i)
@ -6264,10 +6264,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbfind.c
{
/* Not the requested table */
Index: acpica-unix2-20180209/source/components/tables/tbprint.c
Index: acpica-unix-20180313/source/components/tables/tbprint.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbprint.c
+++ acpica-unix2-20180209/source/components/tables/tbprint.c
--- acpica-unix-20180313.orig/source/components/tables/tbprint.c
+++ acpica-unix-20180313/source/components/tables/tbprint.c
@@ -143,15 +143,18 @@ AcpiTbPrintTableHeader (
ACPI_TABLE_HEADER *Header)
{
@ -6309,10 +6309,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbprint.c
}
}
Index: acpica-unix2-20180209/source/components/tables/tbutils.c
Index: acpica-unix-20180313/source/components/tables/tbutils.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbutils.c
+++ acpica-unix2-20180209/source/components/tables/tbutils.c
--- acpica-unix-20180313.orig/source/components/tables/tbutils.c
+++ acpica-unix-20180313/source/components/tables/tbutils.c
@@ -238,7 +238,7 @@ AcpiTbGetRootTableEntry (
* 64-bit platform, XSDT: Move (unaligned) 64-bit to local,
* return 64-bit
@ -6372,10 +6372,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbutils.c
{
AcpiGbl_FadtIndex = TableIndex;
AcpiTbParseFadt ();
Index: acpica-unix2-20180209/source/components/tables/tbxface.c
Index: acpica-unix-20180313/source/components/tables/tbxface.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbxface.c
+++ acpica-unix2-20180209/source/components/tables/tbxface.c
--- acpica-unix-20180313.orig/source/components/tables/tbxface.c
+++ acpica-unix-20180313/source/components/tables/tbxface.c
@@ -293,8 +293,11 @@ AcpiGetTableHeader (
for (i = 0, j = 0; i < AcpiGbl_RootTableList.CurrentTableCount; i++)
@ -6389,11 +6389,11 @@ Index: acpica-unix2-20180209/source/components/tables/tbxface.c
{
continue;
}
Index: acpica-unix2-20180209/source/components/tables/tbxfload.c
Index: acpica-unix-20180313/source/components/tables/tbxfload.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbxfload.c
+++ acpica-unix2-20180209/source/components/tables/tbxfload.c
@@ -156,6 +156,7 @@ AcpiTbLoadNamespace (
--- acpica-unix-20180313.orig/source/components/tables/tbxfload.c
+++ acpica-unix-20180313/source/components/tables/tbxfload.c
@@ -159,6 +159,7 @@ AcpiTbLoadNamespace (
ACPI_TABLE_DESC *Table;
UINT32 TablesLoaded = 0;
UINT32 TablesFailed = 0;
@ -6401,7 +6401,7 @@ Index: acpica-unix2-20180209/source/components/tables/tbxfload.c
ACPI_FUNCTION_TRACE (TbLoadNamespace);
@@ -169,8 +170,9 @@ AcpiTbLoadNamespace (
@@ -172,8 +173,9 @@ AcpiTbLoadNamespace (
*/
Table = &AcpiGbl_RootTableList.Tables[AcpiGbl_DsdtIndex];
@ -6412,10 +6412,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbxfload.c
ACPI_FAILURE (AcpiTbValidateTable (Table)))
{
Status = AE_NO_ACPI_TABLES;
Index: acpica-unix2-20180209/source/tools/acpiexec/aetables.c
Index: acpica-unix-20180313/source/tools/acpiexec/aetables.c
===================================================================
--- acpica-unix2-20180209.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix2-20180209/source/tools/acpiexec/aetables.c
--- acpica-unix-20180313.orig/source/tools/acpiexec/aetables.c
+++ acpica-unix-20180313/source/tools/acpiexec/aetables.c
@@ -146,21 +146,25 @@ AeInitializeTableHeader (
char *Signature,
UINT32 Length)
@ -6430,9 +6430,9 @@ Index: acpica-unix2-20180209/source/tools/acpiexec/aetables.c
- Header->OemRevision = 0x1001;
+ Tmp16 = 0x1001;
+ ACPI_MOVE_16_TO_16(&Header->OemRevision, &Tmp16);
strncpy (Header->OemId, "Intel", ACPI_OEM_ID_SIZE);
strncpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
strncpy (Header->AslCompilerId, "INTL", ACPI_NAME_SIZE);
memcpy (Header->OemId, "Intel ", ACPI_OEM_ID_SIZE);
memcpy (Header->OemTableId, "AcpiExec", ACPI_OEM_TABLE_ID_SIZE);
ACPI_MOVE_NAME (Header->AslCompilerId, "INTL");
- Header->AslCompilerRevision = ACPI_CA_VERSION;
+ Tmp32 = ACPI_CA_VERSION;
+ ACPI_MOVE_32_TO_32(&Header->AslCompilerRevision, &Tmp32);
@ -6473,16 +6473,16 @@ Index: acpica-unix2-20180209/source/tools/acpiexec/aetables.c
/* Miscellaneous FADT fields */
LocalFADT.Gpe0BlockLength = 0x08;
- LocalFADT.Gpe0Block = 0x00001234;
+ Tmp32 = 0x00001234;
LocalFADT.Gpe0BlockLength = 0x20;
- LocalFADT.Gpe0Block = 0x00003210;
+ Tmp32 = 0x00003210;
+ ACPI_MOVE_32_TO_32(&LocalFADT.Gpe0Block, &Tmp32);
LocalFADT.Gpe1BlockLength = 0x80;
- LocalFADT.Gpe1Block = 0x00005678;
+ Tmp32 = 0x00005678;
LocalFADT.Gpe1BlockLength = 0x20;
- LocalFADT.Gpe1Block = 0x0000BA98;
+ Tmp32 = 0x0000BA98;
+ ACPI_MOVE_32_TO_32(&LocalFADT.Gpe1Block, &Tmp32);
LocalFADT.Gpe1Base = 100;
LocalFADT.Gpe1Base = 0x80;
LocalFADT.Pm1EventLength = 4;
- LocalFADT.Pm1aEventBlock = 0x00001aaa;
@ -6567,10 +6567,10 @@ Index: acpica-unix2-20180209/source/tools/acpiexec/aetables.c
}
return (AE_OK);
Index: acpica-unix2-20180209/source/common/dmswitch.c
Index: acpica-unix-20180313/source/common/dmswitch.c
===================================================================
--- acpica-unix2-20180209.orig/source/common/dmswitch.c
+++ acpica-unix2-20180209/source/common/dmswitch.c
--- acpica-unix-20180313.orig/source/common/dmswitch.c
+++ acpica-unix-20180313/source/common/dmswitch.c
@@ -88,13 +88,15 @@ AcpiDmProcessSwitch (
ACPI_PARSE_OBJECT_LIST *Current;
ACPI_PARSE_OBJECT_LIST *Previous;

12
cve-2017-13695.patch
View File

@ -67,13 +67,13 @@ Github-Location: https://github.com/acpica/acpica/pull/296/commits/37f2c716f2c6a
source/components/namespace/nseval.c | 10 ++++++++++
1 file changed, 10 insertions(+)
Index: acpica-unix2-20180209/source/components/namespace/nseval.c
Index: acpica-unix2-20180313/source/components/namespace/nseval.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/namespace/nseval.c
+++ acpica-unix2-20180209/source/components/namespace/nseval.c
@@ -320,6 +320,16 @@ AcpiNsEvaluate (
Status = AE_OK;
--- acpica-unix2-20180313.orig/source/components/namespace/nseval.c
+++ acpica-unix2-20180313/source/components/namespace/nseval.c
@@ -330,6 +330,16 @@ AcpiNsEvaluate (
Info->ReturnObject = NULL;
}
}
+ else if (ACPI_FAILURE(Status))
+ {

119
int-format.patch
View File

@ -24,10 +24,10 @@ From: Al Stone <ahs3@redhat.com>
source/tools/acpiexec/aemain.c | 2 +-
18 files changed, 28 insertions(+), 28 deletions(-)
Index: acpica-unix2-20180209/source/compiler/aslcompile.c
Index: acpica-unix2-20180313/source/compiler/aslcompile.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20180209/source/compiler/aslcompile.c
--- acpica-unix2-20180313.orig/source/compiler/aslcompile.c
+++ acpica-unix2-20180313/source/compiler/aslcompile.c
@@ -750,7 +750,7 @@ CmCleanupAndExit (
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@ -37,10 +37,10 @@ Index: acpica-unix2-20180209/source/compiler/aslcompile.c
ASL_MAX_ERROR_COUNT);
}
Index: acpica-unix2-20180209/source/compiler/aslerror.c
Index: acpica-unix2-20180313/source/compiler/aslerror.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslerror.c
+++ acpica-unix2-20180209/source/compiler/aslerror.c
--- acpica-unix2-20180313.orig/source/compiler/aslerror.c
+++ acpica-unix2-20180313/source/compiler/aslerror.c
@@ -880,7 +880,7 @@ AslLogNewError (
Gbl_ExceptionCount[Level]++;
if (Gbl_ExceptionCount[ASL_ERROR] > ASL_MAX_ERROR_COUNT)
@ -59,10 +59,10 @@ Index: acpica-unix2-20180209/source/compiler/aslerror.c
ASL_MAX_DISABLED_MESSAGES);
return (AE_LIMIT);
}
Index: acpica-unix2-20180209/source/compiler/aslopt.c
Index: acpica-unix2-20180313/source/compiler/aslopt.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslopt.c
+++ acpica-unix2-20180209/source/compiler/aslopt.c
--- acpica-unix2-20180313.orig/source/compiler/aslopt.c
+++ acpica-unix2-20180313/source/compiler/aslopt.c
@@ -584,7 +584,7 @@ OptOptimizeNamePath (
}
@ -72,10 +72,10 @@ Index: acpica-unix2-20180209/source/compiler/aslopt.c
Op->Asl.LogicalLineNumber,
AcpiPsGetOpcodeName (Op->Common.Parent->Common.AmlOpcode),
AcpiPsGetOpcodeName (Op->Common.AmlOpcode)));
Index: acpica-unix2-20180209/source/compiler/aslpredef.c
Index: acpica-unix2-20180313/source/compiler/aslpredef.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20180209/source/compiler/aslpredef.c
--- acpica-unix2-20180313.orig/source/compiler/aslpredef.c
+++ acpica-unix2-20180313/source/compiler/aslpredef.c
@@ -114,7 +114,7 @@ ApCheckForPredefinedMethod (
if (MethodInfo->NumArguments != 0)
@ -85,10 +85,10 @@ Index: acpica-unix2-20180209/source/compiler/aslpredef.c
AslError (ASL_WARNING, ASL_MSG_RESERVED_ARG_COUNT_HI, Op,
MsgBuffer);
Index: acpica-unix2-20180209/source/compiler/aslprepkg.c
Index: acpica-unix2-20180313/source/compiler/aslprepkg.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslprepkg.c
+++ acpica-unix2-20180209/source/compiler/aslprepkg.c
--- acpica-unix2-20180313.orig/source/compiler/aslprepkg.c
+++ acpica-unix2-20180313/source/compiler/aslprepkg.c
@@ -309,7 +309,7 @@ ApCheckPackage (
if (Count & 1)
@ -98,10 +98,10 @@ Index: acpica-unix2-20180209/source/compiler/aslprepkg.c
Predefined->Info.Name, Count);
AslError (ASL_ERROR, ASL_MSG_RESERVED_PACKAGE_LENGTH,
Index: acpica-unix2-20180209/source/components/debugger/dbexec.c
Index: acpica-unix2-20180313/source/components/debugger/dbexec.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/debugger/dbexec.c
+++ acpica-unix2-20180209/source/components/debugger/dbexec.c
--- acpica-unix2-20180313.orig/source/components/debugger/dbexec.c
+++ acpica-unix2-20180313/source/components/debugger/dbexec.c
@@ -230,7 +230,7 @@ AcpiDbExecuteMethod (
ACPI_ERROR ((AE_INFO,
"Possible overflow of internal debugger "
@ -111,10 +111,10 @@ Index: acpica-unix2-20180209/source/components/debugger/dbexec.c
}
}
Index: acpica-unix2-20180209/source/components/dispatcher/dsmthdat.c
Index: acpica-unix2-20180313/source/components/dispatcher/dsmthdat.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix2-20180209/source/components/dispatcher/dsmthdat.c
--- acpica-unix2-20180313.orig/source/components/dispatcher/dsmthdat.c
+++ acpica-unix2-20180313/source/components/dispatcher/dsmthdat.c
@@ -291,7 +291,7 @@ AcpiDsMethodDataGetNode (
if (Index > ACPI_METHOD_MAX_LOCAL)
{
@ -133,10 +133,10 @@ Index: acpica-unix2-20180209/source/components/dispatcher/dsmthdat.c
Index, ACPI_METHOD_MAX_ARG));
return_ACPI_STATUS (AE_AML_INVALID_INDEX);
}
Index: acpica-unix2-20180209/source/components/dispatcher/dsutils.c
Index: acpica-unix2-20180313/source/components/dispatcher/dsutils.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20180209/source/components/dispatcher/dsutils.c
--- acpica-unix2-20180313.orig/source/components/dispatcher/dsutils.c
+++ acpica-unix2-20180313/source/components/dispatcher/dsutils.c
@@ -788,7 +788,7 @@ AcpiDsCreateOperands (
}
@ -146,10 +146,10 @@ Index: acpica-unix2-20180209/source/components/dispatcher/dsutils.c
WalkState->NumOperands, ArgCount, Index));
/* Create the interpreter arguments, in reverse order */
Index: acpica-unix2-20180209/source/components/dispatcher/dswscope.c
Index: acpica-unix2-20180313/source/components/dispatcher/dswscope.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix2-20180209/source/components/dispatcher/dswscope.c
--- acpica-unix2-20180313.orig/source/components/dispatcher/dswscope.c
+++ acpica-unix2-20180313/source/components/dispatcher/dswscope.c
@@ -149,7 +149,7 @@ AcpiDsScopeStackPush (
WalkState->ScopeDepth++;
@ -168,11 +168,11 @@ Index: acpica-unix2-20180209/source/components/dispatcher/dswscope.c
(UINT32) WalkState->ScopeDepth,
AcpiUtGetNodeName (ScopeInfo->Scope.Node),
AcpiUtGetTypeName (ScopeInfo->Common.Value)));
Index: acpica-unix2-20180209/source/components/events/evgpe.c
Index: acpica-unix2-20180313/source/components/events/evgpe.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/events/evgpe.c
+++ acpica-unix2-20180209/source/components/events/evgpe.c
@@ -494,7 +494,7 @@ AcpiEvGpeDetect (
--- acpica-unix2-20180313.orig/source/components/events/evgpe.c
+++ acpica-unix2-20180313/source/components/events/evgpe.c
@@ -481,7 +481,7 @@ AcpiEvGpeDetect (
"Ignore disabled registers for GPE %02X-%02X: "
"RunEnable=%02X, WakeEnable=%02X\n",
GpeRegisterInfo->BaseGpeNumber,
@ -181,19 +181,10 @@ Index: acpica-unix2-20180209/source/components/events/evgpe.c
GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake));
continue;
@@ -520,7 +520,7 @@ AcpiEvGpeDetect (
"Read registers for GPE %02X-%02X: Status=%02X, Enable=%02X, "
"RunEnable=%02X, WakeEnable=%02X\n",
GpeRegisterInfo->BaseGpeNumber,
- GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1),
+ (unsigned int) (GpeRegisterInfo->BaseGpeNumber + (ACPI_GPE_REGISTER_WIDTH - 1)),
(UINT32) StatusReg, (UINT32) EnableReg,
GpeRegisterInfo->EnableForRun,
GpeRegisterInfo->EnableForWake));
Index: acpica-unix2-20180209/source/components/executer/exdump.c
Index: acpica-unix2-20180313/source/components/executer/exdump.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/executer/exdump.c
+++ acpica-unix2-20180209/source/components/executer/exdump.c
--- acpica-unix2-20180313.orig/source/components/executer/exdump.c
+++ acpica-unix2-20180313/source/components/executer/exdump.c
@@ -678,7 +678,7 @@ AcpiExDumpOperand (
if (Depth > 0)
{
@ -203,10 +194,10 @@ Index: acpica-unix2-20180209/source/components/executer/exdump.c
}
else
{
Index: acpica-unix2-20180209/source/components/executer/exfldio.c
Index: acpica-unix2-20180313/source/components/executer/exfldio.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/executer/exfldio.c
+++ acpica-unix2-20180209/source/components/executer/exfldio.c
--- acpica-unix2-20180313.orig/source/components/executer/exfldio.c
+++ acpica-unix2-20180313/source/components/executer/exfldio.c
@@ -681,8 +681,8 @@ AcpiExWriteWithUpdateRule (
ACPI_ERROR ((AE_INFO,
@ -218,10 +209,10 @@ Index: acpica-unix2-20180209/source/components/executer/exfldio.c
return_ACPI_STATUS (AE_AML_OPERAND_VALUE);
}
}
Index: acpica-unix2-20180209/source/components/executer/exnames.c
Index: acpica-unix2-20180313/source/components/executer/exnames.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/executer/exnames.c
+++ acpica-unix2-20180209/source/components/executer/exnames.c
--- acpica-unix2-20180313.orig/source/components/executer/exnames.c
+++ acpica-unix2-20180313/source/components/executer/exnames.c
@@ -237,7 +237,7 @@ AcpiExNameSegment (
*/
ACPI_DEBUG_PRINT ((ACPI_DB_INFO,
@ -240,10 +231,10 @@ Index: acpica-unix2-20180209/source/components/executer/exnames.c
}
*InAmlAddress = ACPI_CAST_PTR (UINT8, AmlAddress);
Index: acpica-unix2-20180209/source/components/hardware/hwregs.c
Index: acpica-unix2-20180313/source/components/hardware/hwregs.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20180209/source/components/hardware/hwregs.c
--- acpica-unix2-20180313.orig/source/components/hardware/hwregs.c
+++ acpica-unix2-20180313/source/components/hardware/hwregs.c
@@ -460,7 +460,7 @@ AcpiHwClearAcpiStatus (
@ -253,10 +244,10 @@ Index: acpica-unix2-20180209/source/components/hardware/hwregs.c
ACPI_FORMAT_UINT64 (AcpiGbl_XPm1aStatus.Address)));
LockFlags = AcpiOsAcquireLock (AcpiGbl_HardwareLock);
Index: acpica-unix2-20180209/source/components/tables/tbfadt.c
Index: acpica-unix2-20180313/source/components/tables/tbfadt.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20180209/source/components/tables/tbfadt.c
--- acpica-unix2-20180313.orig/source/components/tables/tbfadt.c
+++ acpica-unix2-20180313/source/components/tables/tbfadt.c
@@ -233,7 +233,7 @@ AcpiTbInitGenericAddress (
if (!(Flags & ACPI_FADT_GPE_REGISTER))
{
@ -284,10 +275,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbfadt.c
Name, Address32,
ACPI_FORMAT_UINT64 (Address64->Address),
AcpiGbl_Use32BitFadtAddresses ? 32 : 64));
Index: acpica-unix2-20180209/source/components/tables/tbxfroot.c
Index: acpica-unix2-20180313/source/components/tables/tbxfroot.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/tables/tbxfroot.c
+++ acpica-unix2-20180209/source/components/tables/tbxfroot.c
--- acpica-unix2-20180313.orig/source/components/tables/tbxfroot.c
+++ acpica-unix2-20180313/source/components/tables/tbxfroot.c
@@ -177,7 +177,7 @@ AcpiFindRootPointer (
{
ACPI_ERROR ((AE_INFO,
@ -315,10 +306,10 @@ Index: acpica-unix2-20180209/source/components/tables/tbxfroot.c
return_ACPI_STATUS (AE_NO_MEMORY);
}
Index: acpica-unix2-20180209/source/components/utilities/utownerid.c
Index: acpica-unix2-20180313/source/components/utilities/utownerid.c
===================================================================
--- acpica-unix2-20180209.orig/source/components/utilities/utownerid.c
+++ acpica-unix2-20180209/source/components/utilities/utownerid.c
--- acpica-unix2-20180313.orig/source/components/utilities/utownerid.c
+++ acpica-unix2-20180313/source/components/utilities/utownerid.c
@@ -237,7 +237,7 @@ AcpiUtReleaseOwnerId (
else
{
@ -328,10 +319,10 @@ Index: acpica-unix2-20180209/source/components/utilities/utownerid.c
}
(void) AcpiUtReleaseMutex (ACPI_MTX_CACHES);
Index: acpica-unix2-20180209/source/tools/acpiexec/aemain.c
Index: acpica-unix2-20180313/source/tools/acpiexec/aemain.c
===================================================================
--- acpica-unix2-20180209.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix2-20180209/source/tools/acpiexec/aemain.c
--- acpica-unix2-20180313.orig/source/tools/acpiexec/aemain.c
+++ acpica-unix2-20180313/source/tools/acpiexec/aemain.c
@@ -205,7 +205,7 @@ AeDoOptions (
if (strlen (AcpiGbl_Optarg) > (AE_BUFFER_SIZE -1))

14
mips-be-fix.patch
View File

@ -1,7 +1,7 @@
Index: acpica-unix2-20180209/source/compiler/aslparseop.c
Index: acpica-unix2-20180313/source/compiler/aslparseop.c
===================================================================
--- acpica-unix2-20180209.orig/source/compiler/aslparseop.c
+++ acpica-unix2-20180209/source/compiler/aslparseop.c
--- acpica-unix2-20180313.orig/source/compiler/aslparseop.c
+++ acpica-unix2-20180313/source/compiler/aslparseop.c
@@ -283,7 +283,16 @@ TrCreateValuedLeafOp (
@ -20,11 +20,11 @@ Index: acpica-unix2-20180209/source/compiler/aslparseop.c
DbgPrint (ASL_PARSE_OUTPUT,
"\nCreateValuedLeafOp Ln/Col %u/%u NewOp %p "
Index: acpica-unix2-20180209/source/include/platform/aclinux.h
Index: acpica-unix2-20180313/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20180209.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180209/source/include/platform/aclinux.h
@@ -226,10 +226,8 @@
--- acpica-unix2-20180313.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180313/source/include/platform/aclinux.h
@@ -227,10 +227,8 @@
#endif
#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

8
ppc64le.patch
View File

@ -1,8 +1,8 @@
Index: acpica-unix2-20180209/source/include/platform/aclinux.h
Index: acpica-unix2-20180313/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20180209.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180209/source/include/platform/aclinux.h
@@ -227,9 +227,11 @@
--- acpica-unix2-20180313.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180313/source/include/platform/aclinux.h
@@ -228,9 +228,11 @@
#define __cdecl
#endif

8
simple-64bit.patch
View File

@ -3,11 +3,11 @@ Description: Stop listing all 64bit architectures
64bit architectures.
Author: Adrian Bunk <bunk@debian.org>
Index: acpica-unix2-20180209/source/include/platform/aclinux.h
Index: acpica-unix2-20180313/source/include/platform/aclinux.h
===================================================================
--- acpica-unix2-20180209.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180209/source/include/platform/aclinux.h
@@ -209,9 +209,7 @@
--- acpica-unix2-20180313.orig/source/include/platform/aclinux.h
+++ acpica-unix2-20180313/source/include/platform/aclinux.h
@@ -210,9 +210,7 @@
#define ACPI_FLUSH_CPU_CACHE()
#define ACPI_CAST_PTHREAD_T(Pthread) ((ACPI_THREAD_ID) (Pthread))

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (acpica-unix2-20180209.tar.gz) = d4d7b038477da499b2310c2cc38f76a5f4eac721aa8d0e25a5dbeec76d99c0be761ee3abc5737cc63e9a8a86dc4511926d0806474341a0b4d245113af8f7e67d
SHA512 (acpitests-unix-20180209.tar.gz) = 411e264e8dffa18f57496938be65e235f513c571e6e384a4a6d21737456b42c815ec91d42fe14eae7875bffb791308ad2f00d6fd6d943a14f90b3bb9e7b4c7f1
SHA512 (acpica-unix2-20180313.tar.gz) = db29729c4c7264c2a0ddc02de1c39b19396fafb6ee5ee9549d7476fae6ba4cbc6d566a6c8b4b9608872d349882123f6ea416bbd0826166399de051b879071838
SHA512 (acpitests-unix-20180313.tar.gz) = 11a19bdda9a6b2f3a67a464d09a564533d089114cda0764bbd43380ee7d69f3b88dc3f02093ef62ce5785897535e3347fb222042271b0ff1f8fc6b02b04b66d3