UAPI: ndctl / acpi: intel: Avoid multiple -Wflex-array-member-not-at-end warnings
Subsystems (2)
PATCH 1/1 UAPI: ndctl / acpi: intel: Avoid multiple -Wflex-array-member-not-at-end warnings
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with flexible-array members in the middle of other structs, we use the __struct_group() helper to separate the flexible array from the rest of the members in the flexible structure. We then use the newly created tagged struct nd_cmd_pkg_hdr to replace the type of the objects causing trouble (pkg) in multiple structs.
So, with these changes, fix the following warnings:
drivers/acpi/nfit/intel.c:692:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:59:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:586:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:522:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:411:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:358:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:322:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:281:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:238:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:199:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:157:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] drivers/acpi/nfit/intel.c:124:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
--- drivers/acpi/nfit/intel.c | 24 ++++++++++++------------ include/uapi/linux/ndctl.h | 15 +++++++++------ 2 files changed, 21 insertions(+), 18 deletions(-)
drivers/acpi/nfit/intel.c +12 -12
@@ -56,7 +56,7 @@ static unsigned long intel_security_flags(struct nvdimm *nvdimm,struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);unsigned long security_flags =0 ;struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_get_security_state cmd; } nd_cmd = { .pkg = {
@@ -121,7 +121,7 @@ static int intel_security_freeze(struct nvdimm *nvdimm) {struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_freeze_lock cmd; } nd_cmd = { .pkg = {
@@ -154,7 +154,7 @@ static int intel_security_change_key(struct nvdimm *nvdimm, NVDIMM_INTEL_SET_MASTER_PASSPHRASE :NVDIMM_INTEL_SET_PASSPHRASE ;struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_set_passphrase cmd; } nd_cmd = { .pkg = {
@@ -196,7 +196,7 @@ static int __maybe_unused intel_security_unlock(struct nvdimm *nvdimm, {struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_unlock_unit cmd; } nd_cmd = { .pkg = {
@@ -235,7 +235,7 @@ static int intel_security_disable(struct nvdimm *nvdimm,int rc;struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_disable_passphrase cmd; } nd_cmd = { .pkg = {
@@ -278,7 +278,7 @@ static int __maybe_unused intel_security_erase(struct nvdimm *nvdimm,unsigned int cmd = ptype ==NVDIMM_MASTER ?NVDIMM_INTEL_MASTER_SECURE_ERASE :NVDIMM_INTEL_SECURE_ERASE ;struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_secure_erase cmd; } nd_cmd = { .pkg = {
@@ -319,7 +319,7 @@ static int __maybe_unused intel_security_query_overwrite(struct nvdimm *nvdimm)int rc;struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_query_overwrite cmd; } nd_cmd = { .pkg = {
@@ -355,7 +355,7 @@ static int __maybe_unused intel_security_overwrite(struct nvdimm *nvdimm,int rc;struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_overwrite cmd; } nd_cmd = { .pkg = {
@@ -408,7 +408,7 @@ static int intel_bus_fwa_businfo(struct nvdimm_bus_descriptor *nd_desc, struct nd_intel_bus_fw_activate_businfo *info) {struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_bus_fw_activate_businfo cmd; } nd_cmd = { .pkg = {
@@ -519,7 +519,7 @@ static int intel_bus_fwa_activate(struct nvdimm_bus_descriptor *nd_desc) {struct acpi_nfit_desc *acpi_desc =to_acpi_desc (nd_desc);struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_bus_fw_activate cmd; } nd_cmd = { .pkg = {
@@ -583,7 +583,7 @@ static int intel_fwa_dimminfo(struct nvdimm *nvdimm, struct nd_intel_fw_activate_dimminfo *info) {struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_fw_activate_dimminfo cmd; } nd_cmd = { .pkg = {
@@ -689,7 +689,7 @@ static int intel_fwa_arm(struct nvdimm *nvdimm, enum nvdimm_fwa_trigger arm)struct nfit_mem *nfit_mem =nvdimm_provider_data (nvdimm);struct acpi_nfit_desc *acpi_desc = nfit_mem->acpi_desc;struct { -struct nd_cmd_pkg pkg; +struct nd_cmd_pkg_hdr pkg;struct nd_intel_fw_activate_arm cmd; } nd_cmd = { .pkg = {
include/uapi/linux/ndctl.h +9 -6
@@ -227,12 +227,15 @@ enum ars_masks {*/ struct nd_cmd_pkg { -__u64 nd_family;/* family of commands */ -__u64 nd_command; -__u32 nd_size_in;/* INPUT: size of input args */ -__u32 nd_size_out;/* INPUT: size of payload */ -__u32 nd_reserved2[9 ];/* reserved must be zero */ -__u32 nd_fw_size;/* OUTPUT: size fw wants to return */ +/* New members MUST be added within the __struct_group() macro below. */ + __struct_group(nd_cmd_pkg_hdr, __hdr, /* no attrs */, + __u64 nd_family; /* family of commands */ +__u64 nd_command; +__u32 nd_size_in;/* INPUT: size of input args */ +__u32 nd_size_out;/* INPUT: size of payload */ +__u32 nd_reserved2[9 ];/* reserved must be zero */ +__u32 nd_fw_size;/* OUTPUT: size fw wants to return */ + );unsigned char nd_payload[];/* Contents of call */ };
Signature · 1 line
2.43.0
Alison Schofield
maintainerQuoted 10 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with flexible-array members in the middle of other structs, we use the
__struct_group()helper to separate the flexible array from the rest of the members in the flexible structure. We then use the newly created taggedstruct nd_cmd_pkg_hdrto replace the type of the objects causing trouble (pkg) in multiple structs.
Quoted 3 lines
So, with these changes, fix the following warnings:
drivers/acpi/nfit/intel.c:692:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
One sample warning is good.
How about adding a comment on why the usage of __struct_group() here means this doesn't break userspace.
snip
include/uapi/linux/ndctl.h
Quoted 4 lines
include/uapi/linux/ndctl.h +0
-0
FWIW: In a patch like this where reviewers likely want to see the header file change first, put it first in the diff. (git diff.orderfile)
Quoted 26 lines
include/uapi/linux/ndctl.h +9
-6@@ -227,12 +227,15 @@ enum ars_masks {*/ struct nd_cmd_pkg { -__u64 nd_family;/* family of commands */ -__u64 nd_command; -__u32 nd_size_in;/* INPUT: size of input args */ -__u32 nd_size_out;/* INPUT: size of payload */ -__u32 nd_reserved2[9 ];/* reserved must be zero */ -__u32 nd_fw_size;/* OUTPUT: size fw wants to return */ +/* New members MUST be added within the __struct_group() macro below. */ + __struct_group(nd_cmd_pkg_hdr, __hdr, /* no attrs */, + __u64 nd_family; /* family of commands */ +__u64 nd_command; +__u32 nd_size_in;/* INPUT: size of input args */ +__u32 nd_size_out;/* INPUT: size of payload */ +__u32 nd_reserved2[9 ];/* reserved must be zero */ +__u32 nd_fw_size;/* OUTPUT: size fw wants to return */ + );unsigned char nd_payload[];/* Contents of call */ };Signature · 1 line
2.43.0
Quoted 22 lines · Alison Schofield
Quoted 10 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with flexible-array members in the middle of other structs, we use the
__struct_group()helper to separate the flexible array from the rest of the members in the flexible structure. We then use the newly created taggedstruct nd_cmd_pkg_hdrto replace the type of the objects causing trouble (pkg) in multiple structs.Quoted 3 lines
So, with these changes, fix the following warnings:
drivers/acpi/nfit/intel.c:692:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]One sample warning is good.
How about adding a comment on why the usage of
__struct_group()here means this doesn't break userspace.snip
Quoted 8 lines
include/uapi/linux/ndctl.h
Quoted 4 lines
include/uapi/linux/ndctl.h +0
-0FWIW: In a patch like this where reviewers likely want to see the header file change first, put it first in the diff. (git diff.orderfile)
TIL about diff.orderfile! :) Just for my own education, what do you have as the contents for your orderfile? Is it just simply:
*.h
?
Quoted 15 lines
Quoted 15 lines
include/uapi/linux/ndctl.h +3
-6@@ -227,12 +227,15 @@ enum ars_masks {*/ struct nd_cmd_pkg { -__u64 nd_family;/* family of commands */ -__u64 nd_command; -__u32 nd_size_in;/* INPUT: size of input args */ -__u32 nd_size_out;/* INPUT: size of payload */ -__u32 nd_reserved2[9 ];/* reserved must be zero */ -__u32 nd_fw_size;/* OUTPUT: size fw wants to return */ +/* New members MUST be added within the __struct_group() macro below. */ + __struct_group(nd_cmd_pkg_hdr, __hdr, /* no attrs */, + __u64 nd_family; /* family of commands */
Quoted 8 lines
include/uapi/linux/ndctl.h enum ars_masks { · line 240
Quoted 8 lines
include/uapi/linux/ndctl.h +6
-0+__u64 nd_command; +__u32 nd_size_in;/* INPUT: size of input args */ +__u32 nd_size_out;/* INPUT: size of payload */ +__u32 nd_reserved2[9 ];/* reserved must be zero */ +__u32 nd_fw_size;/* OUTPUT: size fw wants to return */ + );unsigned char nd_payload[];/* Contents of call */ };
Gustavo, any updates on this patch? I'm skimming through patchwork to check on stalled patches...
Signature · 1 line
Kees Cook
Quoted 4 lines
Gustavo, any updates on this patch? I'm skimming through patchwork to check on stalled patches...
Yep, I proposed a couple of patches for this:
https://lore.kernel.org/linux-hardening/[email protected]/t/#mf958b73b3021db415b9e9c623c3f386259ca0829
(not sure why my patch doesn't show up on linux-hardening anymore...)
And this is the most recent alternative:
https://lore.kernel.org/linux-hardening/Z-QpUcxFCRByYcTA@kspp/
Thanks
--
Gustavo
Quoted 32 lines · Kees Cook
Quoted 22 lines · Alison Schofield
Quoted 10 lines · Gustavo A. R. Silva
-Wflex-array-member-not-at-end was introduced in GCC-14, and we are getting ready to enable it, globally.
So, in order to avoid ending up with flexible-array members in the middle of other structs, we use the
__struct_group()helper to separate the flexible array from the rest of the members in the flexible structure. We then use the newly created taggedstruct nd_cmd_pkg_hdrto replace the type of the objects causing trouble (pkg) in multiple structs.Quoted 3 lines
So, with these changes, fix the following warnings:
drivers/acpi/nfit/intel.c:692:35: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]One sample warning is good.
How about adding a comment on why the usage of
__struct_group()here means this doesn't break userspace.snip
Quoted 8 lines
include/uapi/linux/ndctl.h
Quoted 4 lines
include/uapi/linux/ndctl.h +0
-0FWIW: In a patch like this where reviewers likely want to see the header file change first, put it first in the diff. (git diff.orderfile)
Quoted 6 lines
TIL about diff.orderfile! :) Just for my own education, what do you have as the contents for your orderfile? Is it just simply:
*.h
?
I've updated my local environment to use this, to see how well it ends up behaving:
Kconfig
*/Kconfig
*/Kconfig.*Makefile
*/Makefile
*/Makefile.*scripts/*Documentation/*
*.h
*.S
*.ctools/testing/*
https://github.com/kees/kernel-tools/commit/909db155b5cd36832d10d7d9932d7b51b46388aa
-Kees
Signature · 1 line
Kees Cook