ACPICA: Replace fake flexible arrays with flexible array members
Subsystems (2)
PATCH v2 1/1 ACPICA: Replace fake flexible arrays with flexible array members
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the FORTIFY_SOURCE routines on memcpy(), correctly instrument array indexing with UBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.
Replace one-element array with flexible-array member in struct acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in struct acpi_pci_routing_table.
This results in no differences in binary output.
---
v2: include stddef.h and switch to __DECLARE_FLEX_ARRAY()
v1: https://lore.kernel.org/lkml/[email protected]/
--- include/acpi/acrestyp.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
include/acpi/acrestyp.h +7 -2
@@ -10,6 +10,8 @@#ifndef __ACRESTYP_H__#define __ACRESTYP_H__ +#include <linux/stddef.h> +/* * Definitions for Resource Attributes */
@@ -332,7 +334,7 @@ struct acpi_resource_extended_irq {u8 wake_capable;u8 interrupt_count;struct acpi_resource_source resource_source; -u32 interrupts[1 ]; +u32 interrupts[]; };struct acpi_resource_generic_register {
@@ -679,7 +681,10 @@ struct acpi_pci_routing_table {u32 pin;u64 address;/* here for 64-bit alignment */ u32 source_index; - char source[4]; /* pad to 64 bits so sizeof() works in all cases */ +union { +char pad[4 ];/* pad to 64 bits so sizeof() works in all cases */ + __DECLARE_FLEX_ARRAY(char, source); + }; };#endif /* __ACRESTYP_H__ */
Signature · 1 line
2.34.1
Rafael J. Wysocki
maintainerQuoted 49 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.This results in no differences in binary output.
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>---
v2: includestddef.hand switch to__DECLARE_FLEX_ARRAY()
v1: https://lore.kernel.org/lkml/[email protected]/--- include/acpi/acrestyp.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)include/acpi/acrestyp.h +3
-1@@ -10,6 +10,8 @@#ifndef __ACRESTYP_H__#define __ACRESTYP_H__ +#include <linux/stddef.h> +/* * Definitions for Resource Attributes */ @@ -332,7 +334,7 @@ struct acpi_resource_extended_irq {u8 wake_capable;u8 interrupt_count;struct acpi_resource_source resource_source; -u32 interrupts[1 ]; +u32 interrupts[]; };struct acpi_resource_generic_register {@@ -679,7 +681,10 @@ struct acpi_pci_routing_table {u32 pin;u64 address;/* here for 64-bit alignment */
include/acpi/acrestyp.h struct acpi_pci_routing_table {
Quoted 10 lines
include/acpi/acrestyp.h +4
-2u32 source_index; -char source[4 ];/* pad to 64 bits so sizeof() works in all cases */ +union { +char pad[4 ];/* pad to 64 bits so sizeof() works in all cases */ + __DECLARE_FLEX_ARRAY(char, source); + }; };#endif /* __ACRESTYP_H__ */ --
With this applied I get:
rafael@gratch:~/work/linux-pm/tools/power/acpi> make
DESCEND tools/acpidbg
MKDIR include CP include CC tools/acpidbg/acpidbg.o
In file included from /scratch/rafael/work/linux-pm/tools/power/acpi/include/acpi/acpi.h:27:0,
from acpidbg.c:9:
/scratch/rafael/work/linux-pm/tools/power/acpi/include/acpi/acrestyp.h:686:3:
error: expected specif
ier-qualifier-list before ‘__DECLARE_FLEX_ARRAY’
__DECLARE_FLEX_ARRAY(char, source);
^~~~~~~~~~~~~~~~~~~~
make[1]: *** [../../Makefile.rules:25:
/scratch/rafael/work/linux-pm/tools/power/acpi/tools/acpidbg/ acpidbg.o] Error 1
make: *** [Makefile:18: acpidbg] Error 2
The tools build successfully without it.
Quoted 81 lines · Rafael J. Wysocki
Quoted 49 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.This results in no differences in binary output.
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>---
v2: includestddef.hand switch to__DECLARE_FLEX_ARRAY()
v1: https://lore.kernel.org/lkml/[email protected]/--- include/acpi/acrestyp.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)include/acpi/acrestyp.h +3
-1@@ -10,6 +10,8 @@#ifndef __ACRESTYP_H__#define __ACRESTYP_H__ +#include <linux/stddef.h> +/* * Definitions for Resource Attributes */ @@ -332,7 +334,7 @@ struct acpi_resource_extended_irq {u8 wake_capable;u8 interrupt_count;struct acpi_resource_source resource_source; -u32 interrupts[1 ]; +u32 interrupts[]; };struct acpi_resource_generic_register {@@ -679,7 +681,10 @@ struct acpi_pci_routing_table {u32 pin;u64 address;/* here for 64-bit alignment */ include/acpi/acrestyp.h struct acpi_pci_routing_table {
Quoted 10 lines
include/acpi/acrestyp.h +4
-2u32 source_index; -char source[4 ];/* pad to 64 bits so sizeof() works in all cases */ +union { +char pad[4 ];/* pad to 64 bits so sizeof() works in all cases */ + __DECLARE_FLEX_ARRAY(char, source); + }; };#endif /* __ACRESTYP_H__ */ --With this applied I get:
rafael@gratch:~/work/linux-pm/tools/power/acpi> make
DESCENDtools/acpidbgMKDIR include CP include CC tools/acpidbg/acpidbg.oIn file included from /scratch/rafael/work/linux-pm/tools/power/acpi/include/acpi/acpi.h:27:0,
from acpidbg.c:9:
/scratch/rafael/work/linux-pm/tools/power/acpi/include/acpi/acrestyp.h:686:3:
error: expected specif
ier-qualifier-list before ‘__DECLARE_FLEX_ARRAY’
__DECLARE_FLEX_ARRAY(char, source);
^~~~~~~~~~~~~~~~~~~~
make[1]: *** [../../Makefile.rules:25:
/scratch/rafael/work/linux-pm/tools/power/acpi/tools/acpidbg/ acpidbg.o] Error 1
make: *** [Makefile:18: acpidbg] Error 2
Quoted 1 line
The tools build successfully without it.
I think a "make clean" is needed first? It builds for me...
Signature · 1 line
Kees Cook
Rafael J. Wysocki
maintainerQuoted 83 lines · Kees Cook
Quoted 81 lines · Rafael J. Wysocki
Quoted 49 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.This results in no differences in binary output.
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>---
v2: includestddef.hand switch to__DECLARE_FLEX_ARRAY()
v1: https://lore.kernel.org/lkml/[email protected]/--- include/acpi/acrestyp.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)include/acpi/acrestyp.h +3
-1@@ -10,6 +10,8 @@#ifndef __ACRESTYP_H__#define __ACRESTYP_H__ +#include <linux/stddef.h> +/* * Definitions for Resource Attributes */ @@ -332,7 +334,7 @@ struct acpi_resource_extended_irq {u8 wake_capable;u8 interrupt_count;struct acpi_resource_source resource_source; -u32 interrupts[1 ]; +u32 interrupts[]; };struct acpi_resource_generic_register {@@ -679,7 +681,10 @@ struct acpi_pci_routing_table {u32 pin;u64 address;/* here for 64-bit alignment */ include/acpi/acrestyp.h struct acpi_pci_routing_table {
Quoted 10 lines
include/acpi/acrestyp.h +4
-2u32 source_index; -char source[4 ];/* pad to 64 bits so sizeof() works in all cases */ +union { +char pad[4 ];/* pad to 64 bits so sizeof() works in all cases */ + __DECLARE_FLEX_ARRAY(char, source); + }; };#endif /* __ACRESTYP_H__ */ --With this applied I get:
rafael@gratch:~/work/linux-pm/tools/power/acpi> make
DESCENDtools/acpidbgMKDIR include CP include CC tools/acpidbg/acpidbg.oIn file included from /scratch/rafael/work/linux-pm/tools/power/acpi/include/acpi/acpi.h:27:0,
from acpidbg.c:9:
/scratch/rafael/work/linux-pm/tools/power/acpi/include/acpi/acrestyp.h:686:3:
error: expected specif
ier-qualifier-list before ‘__DECLARE_FLEX_ARRAY’
__DECLARE_FLEX_ARRAY(char, source);
^~~~~~~~~~~~~~~~~~~~
make[1]: *** [../../Makefile.rules:25:
/scratch/rafael/work/linux-pm/tools/power/acpi/tools/acpidbg/ acpidbg.o] Error 1
make: *** [Makefile:18: acpidbg] Error 2
Quoted 3 lines
Quoted 1 line
The tools build successfully without it.
I think a "make clean" is needed first? It builds for me...
I think that the default user space header files on this machine may not be up to date.
I'll apply the v2, thanks!
Hi,
Quoted 11 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.
Quoted 5 lines
This results in no differences in binary output.
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
This patch results in boot failures of 32-bit images. Reverting it fixes the problem.
On the failing boot tests, I see messages such as
ACPI: \_SB_.GSIA: Enabled at IRQ 117440528
ERROR: Unable to locate IOAPIC for GSI 117440528 ahci 0000:00:1f.2: PCI INT A: failed to register GSI
ACPI: \_SB_.GSIG: Enabled at IRQ 117440534
ERROR: Unable to locate IOAPIC for GSI 117440534 8139cp 0000:00:02.0: PCI INT A: failed to register GSI
Given that 117440534 == 0x7000016, that looks quite suspicious. Indeed, after reverting this patch, the messages are different.
ACPI: \_SB_.GSIA: Enabled at IRQ 16
ahci 0000:00:1f.2: AHCI 0001.0000 32 slots 6 ports 1.5 Gbps 0x3f impl SATA mode
ACPI: \_SB_.GSIG: Enabled at IRQ 22
8139cp 0000:00:02.0 eth0: RTL-8139C+ at 0xd0804000, 52:54:00:12:34:56, IRQ 22
Guenter
Quoted 32 lines · Guenter Roeck
Hi,
Quoted 11 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.Quoted 5 lines
This results in no differences in binary output.
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>This patch results in boot failures of 32-bit images. Reverting it fixes the problem.
On the failing boot tests, I see messages such as
ACPI: \_SB_.GSIA: Enabled at IRQ 117440528
ERROR: Unable to locate IOAPIC for GSI 117440528 ahci 0000:00:1f.2: PCI INT A: failed to register GSIACPI: \_SB_.GSIG: Enabled at IRQ 117440534
ERROR: Unable to locate IOAPIC for GSI 117440534 8139cp 0000:00:02.0: PCI INT A: failed to register GSI
Quoted 8 lines
Given that 117440534 ==
0x7000016, that looks quite suspicious. Indeed, after reverting this patch, the messages are different.ACPI: \_SB_.GSIA: Enabled at IRQ 16
ahci 0000:00:1f.2: AHCI 0001.0000 32 slots 6 ports 1.5 Gbps0x3fimpl SATA modeACPI: \_SB_.GSIG: Enabled at IRQ 22
8139cp 0000:00:02.0 eth0: RTL-8139C+ at0xd0804000, 52:54:00:12:34:56, IRQ 22
Thanks for the report, I have reverted this commit from my linux-next branch and will not include it into my 6.3-rc1 pull requests at all.
Thanks!
Quoted 14 lines · Guenter Roeck
Hi,
Quoted 11 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.
Quoted 7 lines
Quoted 5 lines
This results in no differences in binary output.
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>This patch results in boot failures of 32-bit images.
Weird -- I didn't see any binary differences. I'll investigate. What compiler and arch?
-Kees
Quoted 8 lines
Reverting it fixes the problem.
On the failing boot tests, I see messages such as
ACPI: \_SB_.GSIA: Enabled at IRQ 117440528
ERROR: Unable to locate IOAPIC for GSI 117440528 ahci 0000:00:1f.2: PCI INT A: failed to register GSI
Quoted 6 lines
ACPI: \_SB_.GSIG: Enabled at IRQ 117440534
ERROR: Unable to locate IOAPIC for GSI 117440534 8139cp 0000:00:02.0: PCI INT A: failed to register GSIGiven that 117440534 ==
0x7000016, that looks quite suspicious. Indeed, after reverting this patch, the messages are different.
Yeah, seems like a high byte not getting cleared. Hmm.
Quoted 8 lines
ACPI: \_SB_.GSIA: Enabled at IRQ 16
ahci 0000:00:1f.2: AHCI 0001.0000 32 slots 6 ports 1.5 Gbps0x3fimpl SATA modeACPI: \_SB_.GSIG: Enabled at IRQ 22
8139cp 0000:00:02.0 eth0: RTL-8139C+ at0xd0804000, 52:54:00:12:34:56, IRQ 22Guenter
Signature · 1 line
Kees Cook
Quoted 17 lines · Kees Cook
Quoted 16 lines · Guenter Roeck
Hi,
Quoted 13 lines · Kees Cook
One-element arrays (and multi-element arrays being treated as dynamically sized) are deprecated[1] and are being replaced with flexible array members in support of the ongoing efforts to tighten the
FORTIFY_SOURCEroutines onmemcpy(), correctly instrument array indexing withUBSAN_BOUNDS, and to globally enable -fstrict-flex-arrays=3.Replace one-element array with flexible-array member in struct
acpi_resource_extended_irq. Replace 4-byte fixed-size array with 4-byte padding in a union with a flexible-array member in structacpi_pci_routing_table.This results in no differences in binary output.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Signed-off-by Kees Cook <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>This patch results in boot failures of 32-bit images.
Weird -- I didn't see any binary differences. I'll investigate. What compiler and arch?
gcc 11.3, binutils 2.39, x86 (32-bit build). This is pretty much defconfig with ARCH=i386 and various debug options enabled.
64-bit builds do not have the problem.
Guenter
Quoted 29 lines
-Kees
Quoted 8 lines
Reverting it fixes the problem.
On the failing boot tests, I see messages such as
ACPI: \_SB_.GSIA: Enabled at IRQ 117440528
ERROR: Unable to locate IOAPIC for GSI 117440528 ahci 0000:00:1f.2: PCI INT A: failed to register GSIQuoted 6 lines
ACPI: \_SB_.GSIG: Enabled at IRQ 117440534
ERROR: Unable to locate IOAPIC for GSI 117440534 8139cp 0000:00:02.0: PCI INT A: failed to register GSIGiven that 117440534 ==
0x7000016, that looks quite suspicious. Indeed, after reverting this patch, the messages are different.Yeah, seems like a high byte not getting cleared. Hmm.
Quoted 8 lines
ACPI: \_SB_.GSIA: Enabled at IRQ 16
ahci 0000:00:1f.2: AHCI 0001.0000 32 slots 6 ports 1.5 Gbps0x3fimpl SATA modeACPI: \_SB_.GSIG: Enabled at IRQ 22
8139cp 0000:00:02.0 eth0: RTL-8139C+ at0xd0804000, 52:54:00:12:34:56, IRQ 22Guenter