From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 07EC61DE4EC; Fri, 14 Feb 2025 22:04:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.17 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739570699; cv=none; b=gvNUBiSJ9E8cYGFXZxKE1uK3BZpxlYSzInww90zjCiIs1mLjxM5zuSkUU0o4N0ggZ45Ip2a1Ga+md6Ns12JE/P/HdBnCRkwpgdym1rnZBcFESYqZ7RQhPpagvWxCrrfvKhvSJQHoKpO57ES53Sr0OtqgUVamdmYSdL9+BfDkxQA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739570699; c=relaxed/simple; bh=J/rKKMwC/kabnHJWcaexBk0k40NtKiKRhIuwg5IC68s=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=SYRGwHR4FJXVNP6AQGhu7OHc5IG1Ac5Fo5+bSYQFjuBllq/IUJjVobR8Ns4+9JhOS2jcVusAQqcvdF8UsOx8NMQk9+emFKum/P7oY/BQCCsgSZgbmGBaPAW2+T3HD7YZN3aXlNRgoNfMKZtNrq/+oE9CyDWwvQy41qc1+ENKg9I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=doVrmrD1; arc=none smtp.client-ip=192.198.163.17 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="doVrmrD1" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1739570697; x=1771106697; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=J/rKKMwC/kabnHJWcaexBk0k40NtKiKRhIuwg5IC68s=; b=doVrmrD1L7qlDqB8ral41x27MjdECNtnSk5CDWbNLdRCm60noMTMsX1E KCgZZH2PxbKKjiR5y7Yb65OsN/6/xsKzSK76NTy3pMCy/hKtwm2/cM6WP 6ExcFjro3S8jIl4OTYQct5NCn6lcz+b6rg/kpqMDTmDHt1JvdyjnAZyNY 8BQKFsU0qpTT2YaPZP7rn9PFinKgOeG0SaCLkL/hlG/bedY9aRnx5hKCb aP2JTQNchMG9Q9fWxK4akHDF/3mX7bNugJqVgZHchfJRdaQViPzfcGNPP 4RxUVMuDmr1Fa2WxrPm5cbqgOEI0yLpkzI0Pi5RIYnQzdW74576rhnDr0 w==; X-CSE-ConnectionGUID: EMvzS9WxRY+dZbPSL8hUyA== X-CSE-MsgGUID: uq1XfQnZTgum/SiIm6F2qA== X-IronPort-AV: E=McAfee;i="6700,10204,11345"; a="40204478" X-IronPort-AV: E=Sophos;i="6.13,287,1732608000"; d="scan'208";a="40204478" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2025 14:04:56 -0800 X-CSE-ConnectionGUID: NcaBv5u4SNO3YHCvlMIpzA== X-CSE-MsgGUID: Til1bxf1QISv08HjLJWKAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,224,1728975600"; d="scan'208";a="136794936" Received: from lstrano-mobl6.amr.corp.intel.com (HELO [10.125.109.34]) ([10.125.109.34]) by fmviesa002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2025 14:04:56 -0800 Message-ID: Date: Fri, 14 Feb 2025 15:04:52 -0700 Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2][next] UAPI: ndctl / acpi: intel: Avoid multiple -Wflex-array-member-not-at-end warnings To: "Gustavo A. R. Silva" , Alison Schofield , Dan Williams , Vishal Verma , Ira Weiny , "Rafael J. Wysocki" , Len Brown Cc: nvdimm@lists.linux.dev, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org References: Content-Language: en-US From: Dave Jiang In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 2/13/25 5:53 PM, Gustavo A. R. Silva wrote: > -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. > > Below is the before-and-after changes of the memory layout in `struct > nd_cmd_pkg`. This to illustrate that the use of `__struct_group()` > doesn't alter the layout, ensuring that user space remains unaffected. > > Before changes: > struct nd_cmd_pkg { > __u64 nd_family; /* 0 8 */ > __u64 nd_command; /* 8 8 */ > __u32 nd_size_in; /* 16 4 */ > __u32 nd_size_out; /* 20 4 */ > __u32 nd_reserved2[9]; /* 24 36 */ > __u32 nd_fw_size; /* 60 4 */ > /* --- cacheline 1 boundary (64 bytes) --- */ > unsigned char nd_payload[]; /* 64 0 */ > > /* size: 64, cachelines: 1, members: 7 */ > }; > > After changes: > struct nd_cmd_pkg { > union { > struct { > __u64 nd_family; /* 0 8 */ > __u64 nd_command; /* 8 8 */ > __u32 nd_size_in; /* 16 4 */ > __u32 nd_size_out; /* 20 4 */ > __u32 nd_reserved2[9]; /* 24 36 */ > __u32 nd_fw_size; /* 60 4 */ > }; /* 0 64 */ > struct nd_cmd_pkg_hdr __hdr; /* 0 64 */ > }; /* 0 64 */ > /* --- cacheline 1 boundary (64 bytes) --- */ > unsigned char nd_payload[]; /* 64 0 */ > > /* size: 64, cachelines: 1, members: 2 */ > }; > > It's also worth mentioning that all members of the struct can still be > accessed directly, for example instance->nd_family, instance->nd_command, > and so on. > > So, with these changes, fix 12 of 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] > > Signed-off-by: Gustavo A. R. Silva Reviewed-by: Dave Jiang > --- > Changes in v2: > - Show changes in UAPI first. (Alison) > - Update changelog text --add more information about _struct_group() > changes. (Alison) > > v1: > - Link: https://lore.kernel.org/linux-hardening/Z618ILbAR8YAvTkd@kspp/ > > include/uapi/linux/ndctl.h | 15 +++++++++------ > drivers/acpi/nfit/intel.c | 24 ++++++++++++------------ > 2 files changed, 21 insertions(+), 18 deletions(-) > > diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h > index 73516e263627..34c11644d5d7 100644 > --- a/include/uapi/linux/ndctl.h > +++ b/include/uapi/linux/ndctl.h > @@ -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 */ > }; > > diff --git a/drivers/acpi/nfit/intel.c b/drivers/acpi/nfit/intel.c > index 3902759abcba..fe561ce0ddec 100644 > --- a/drivers/acpi/nfit/intel.c > +++ b/drivers/acpi/nfit/intel.c > @@ -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 = {