Commit 5e54510a authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Kees Cook
Browse files

acpi: nfit: 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.

Use the new TRAILING_OVERLAP() helper to fix a dozen instances of
the following type of warning:

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]

Acked-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarGustavo A. R. Silva <gustavoars@kernel.org>
Link: https://lore.kernel.org/r/aF7pF4kej8VQapyR@kspp


Signed-off-by: default avatarKees Cook <kees@kernel.org>
parent 29bb79e9

drivers/acpi/nfit/intel.c

+52 −67
Original line number Diff line number Diff line
@@ -55,10 +55,9 @@ 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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_get_security_state cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_GET_SECURITY_STATE,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -120,10 +119,9 @@ static unsigned long intel_security_flags(struct nvdimm *nvdimm, 
static int intel_security_freeze(struct nvdimm *nvdimm)

{

	struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);

	struct {

		struct nd_cmd_pkg pkg;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_freeze_lock cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_FREEZE_LOCK,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -153,10 +151,9 @@ static int intel_security_change_key(struct nvdimm *nvdimm, 
	unsigned int cmd = ptype == NVDIMM_MASTER ?

		NVDIMM_INTEL_SET_MASTER_PASSPHRASE :

		NVDIMM_INTEL_SET_PASSPHRASE;

	struct {

		struct nd_cmd_pkg pkg;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_set_passphrase cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_family = NVDIMM_FAMILY_INTEL,

			.nd_size_in = ND_INTEL_PASSPHRASE_SIZE * 2,
@@ -195,10 +192,9 @@ static int __maybe_unused intel_security_unlock(struct nvdimm *nvdimm, 
		const struct nvdimm_key_data *key_data)

{

	struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);

	struct {

		struct nd_cmd_pkg pkg;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_unlock_unit cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_UNLOCK_UNIT,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -234,10 +230,9 @@ 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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_disable_passphrase cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_DISABLE_PASSPHRASE,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -277,10 +272,9 @@ static int __maybe_unused intel_security_erase(struct nvdimm *nvdimm, 
	struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm);

	unsigned int cmd = ptype == NVDIMM_MASTER ?

		NVDIMM_INTEL_MASTER_SECURE_ERASE : NVDIMM_INTEL_SECURE_ERASE;

	struct {

		struct nd_cmd_pkg pkg;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_secure_erase cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_family = NVDIMM_FAMILY_INTEL,

			.nd_size_in = ND_INTEL_PASSPHRASE_SIZE,
@@ -318,10 +312,9 @@ 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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_query_overwrite cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_QUERY_OVERWRITE,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -354,10 +347,9 @@ 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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_overwrite cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_OVERWRITE,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -407,10 +399,9 @@ const struct nvdimm_security_ops *intel_security_ops = &__intel_security_ops; 
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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_bus_fw_activate_businfo cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_BUS_INTEL_FW_ACTIVATE_BUSINFO,

			.nd_family = NVDIMM_BUS_FAMILY_INTEL,
@@ -518,11 +509,12 @@ static enum nvdimm_fwa_capability intel_bus_fwa_capability( 
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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_bus_fw_activate cmd;

	} nd_cmd = {

		.pkg = {

	) nd_cmd;

	int rc;



	nd_cmd.pkg = (struct nd_cmd_pkg) {

		.nd_command = NVDIMM_BUS_INTEL_FW_ACTIVATE,

		.nd_family = NVDIMM_BUS_FAMILY_INTEL,

		.nd_size_in = sizeof(nd_cmd.cmd.iodev_state),
@@ -530,21 +522,18 @@ static int intel_bus_fwa_activate(struct nvdimm_bus_descriptor *nd_desc) 
			sizeof(struct nd_intel_bus_fw_activate),

		.nd_fw_size =

			sizeof(struct nd_intel_bus_fw_activate),

		},

	};

	nd_cmd.cmd = (struct nd_intel_bus_fw_activate) {

		/*

		 * Even though activate is run from a suspended context,

		 * for safety, still ask platform firmware to force

		 * quiesce devices by default. Let a module

		 * parameter override that policy.

		 */

		.cmd = {

		.iodev_state = acpi_desc->fwa_noidle

			? ND_INTEL_BUS_FWA_IODEV_OS_IDLE

			: ND_INTEL_BUS_FWA_IODEV_FORCE_IDLE,

		},

	};

	int rc;



	switch (intel_bus_fwa_state(nd_desc)) {

	case NVDIMM_FWA_ARMED:

	case NVDIMM_FWA_ARM_OVERFLOW:
@@ -582,10 +571,9 @@ const struct nvdimm_bus_fw_ops *intel_bus_fw_ops = &__intel_bus_fw_ops; 
static int intel_fwa_dimminfo(struct nvdimm *nvdimm,

		struct nd_intel_fw_activate_dimminfo *info)

{

	struct {

		struct nd_cmd_pkg pkg;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_fw_activate_dimminfo cmd;

	} nd_cmd = {

	) nd_cmd = {

		.pkg = {

			.nd_command = NVDIMM_INTEL_FW_ACTIVATE_DIMMINFO,

			.nd_family = NVDIMM_FAMILY_INTEL,
@@ -688,26 +676,23 @@ 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;

	TRAILING_OVERLAP(struct nd_cmd_pkg, pkg, nd_payload,

		struct nd_intel_fw_activate_arm cmd;

	} nd_cmd = {

		.pkg = {

	) nd_cmd;

	int rc;



	nd_cmd.pkg = (struct nd_cmd_pkg) {

		.nd_command = NVDIMM_INTEL_FW_ACTIVATE_ARM,

		.nd_family = NVDIMM_FAMILY_INTEL,

		.nd_size_in = sizeof(nd_cmd.cmd.activate_arm),

			.nd_size_out =

				sizeof(struct nd_intel_fw_activate_arm),

			.nd_fw_size =

				sizeof(struct nd_intel_fw_activate_arm),

		},

		.cmd = {

			.activate_arm = arm == NVDIMM_FWA_ARM

				? ND_INTEL_DIMM_FWA_ARM

				: ND_INTEL_DIMM_FWA_DISARM,

		},

		.nd_size_out = sizeof(struct nd_intel_fw_activate_arm),

		.nd_fw_size = sizeof(struct nd_intel_fw_activate_arm),

	};

	nd_cmd.cmd = (struct nd_intel_fw_activate_arm) {

		.activate_arm = arm == NVDIMM_FWA_ARM ?

					ND_INTEL_DIMM_FWA_ARM :

					ND_INTEL_DIMM_FWA_DISARM,

	};

	int rc;



	switch (intel_fwa_state(nvdimm)) {

	case NVDIMM_FWA_INVALID: