Skip to content

Commit b69d1ac

Browse files
committed
Use pack attribute for AML_RESOURCE in acpica
This fixes kUBSan warnings. Patch by Akul Pillai.
1 parent 5762fe1 commit b69d1ac

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

sys/external/bsd/acpica/dist/include/amlresrc.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,10 +642,6 @@ typedef struct aml_resource_pin_group_config
642642

643643
#define AML_RESOURCE_PIN_GROUP_CONFIG_REVISION 1 /* ACPI 6.2 */
644644

645-
/* restore default alignment */
646-
647-
#pragma pack()
648-
649645
/* Union of all resource descriptors, so we can allocate the worst case */
650646

651647
typedef union aml_resource
@@ -700,6 +696,9 @@ typedef union aml_resource
700696

701697
} AML_RESOURCE;
702698

699+
/* restore default alignment */
700+
701+
#pragma pack()
703702

704703
/* Interfaces used by both the disassembler and compiler */
705704

0 commit comments

Comments
 (0)