Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Fri, 15 Sep 2023 09:20:07 -0700
From:   Ira Weiny <ira.weiny@intel.com>
To:     Yu Liao <liaoyu15@huawei.com>, <dan.j.williams@intel.com>,
        <vishal.l.verma@intel.com>, <dave.jiang@intel.com>,
        <ira.weiny@intel.com>, <rafael@kernel.org>
CC:     <liaoyu15@huawei.com>, <liwei391@huawei.com>, <lenb@kernel.org>,
        <robert.moore@intel.com>, <linux-acpi@vger.kernel.org>,
        <nvdimm@lists.linux.dev>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 2/2] ACPI: NFIT: use struct_size() helper
Message-ID: <65048437b07bb_3777b5294c3@iweiny-mobl.notmuch>
References: <20230826071654.564372-1-liaoyu15@huawei.com>
 <20230826071654.564372-2-liaoyu15@huawei.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20230826071654.564372-2-liaoyu15@huawei.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AVGy6SOcNaXoaa1fbzS/v3TLEk2493U2t8PwIbp399cgPRrPLr7YW+cuQqzB?=
 =?us-ascii?Q?3bcyGYnX2USKKWsbYC2A16xHMtLT+nH2EWXngDB+b3Kd0t6EFEvC9s0aWf7K?=
 =?us-ascii?Q?IatlcrCT0QJmLyErUUOLj9J71Foq/UTmpuShuOWUEEa5vj7JeK0h0+UAxVCQ?=
 =?us-ascii?Q?1o1wFrvfYmVs/TG0wW5H4i+mGGgKNcentj4ZuB2Q42674X8MfpvGth/u2wUf?=
 =?us-ascii?Q?NE1dQeBBdnAKNqZUGFRtfUklnvacweHxWR9ypIXHM5VtcB6fJI/TjHmcUtaH?=
 =?us-ascii?Q?lvwdKhvRwq7zGnQFDUxMKMJNpjPfA/zFqe3RT+NtqCfmx5ct/jj4I16TtrrL?=
 =?us-ascii?Q?KyVbDBnFI0TijTvVNPMrkYL4wvDCe8LhcWGKx7dM+Nh0q0sH9/EK2o7y68iQ?=
 =?us-ascii?Q?uBGz0RUX9NLCxFlQ0FbDrOV1iyw3oCJkqXqJrpEJbMs84SwpOH3yioEtvfxW?=
 =?us-ascii?Q?eS/nbss7DjgGd0nikPiywBvlRStdF1wSgRxXUVfswZSa6SaUPtUn6qEgacb8?=
 =?us-ascii?Q?qYqoxYtHd42wStIkNsdwCxeowlPRQOlr1aJyEJXJoskoGXzSIbE0X6UmOrhV?=
 =?us-ascii?Q?zfG8lRZ24qCLyZvpmWTVPlFsPvSLoAAeIhDnN/dNVLnwxnSfzurS5KELMhpc?=
 =?us-ascii?Q?T9lm36ST8r8/bby5KvcLK+MsVquhUNaOdwzJWd7mBNknghudjarIXB+i0K9z?=
 =?us-ascii?Q?ZXLCKgjeN1ZOz13CoXvAdQTvGR0lntTGsUyHO+SkGx6M1YxwmgsoFvSqOa7k?=
 =?us-ascii?Q?gSB5ic01rDrmj4r8Zfyml4M+4Rp+jUcpeLYVgzme+T07mRVO585jA348bKdA?=
 =?us-ascii?Q?1wuu1TIWajfCbf5uCUeO9kuFKGTj3jSxid7S8dJ8QfFyv9TUE8zgqYp1kyBC?=
 =?us-ascii?Q?BtKE3cVJDWuemhn46VeqF3/j9OlVGDhdllZusk5N3eNIz9Hpbn57JGC8tTvo?=
 =?us-ascii?Q?TzAirDhspgf/TNnZngoXsbvnkvdREPypWCfPcQDlEB6g8T5i8CEMVEGT8yi7?=
 =?us-ascii?Q?0OxnwCd5mapbIzMszvRZA/sVXAeowc3yLy44eRoCQUTAsTZSn7TNvD+LV8eI?=
 =?us-ascii?Q?a5dKp/U6PR/rEUdOqTKh6jJBPdetHLuhLzXBapD/qLrRtmgIRQbJBlVEXMBS?=
 =?us-ascii?Q?xp/xGuqeKSYpm/HfgwvB0RPwYGOXROoA65/WZQQISTrZSCW06/cUd7q7yF6V?=
 =?us-ascii?Q?qUstgIBXIHz/EMqjKsJNJIobe/4BZ3VdnovGMKUUxsf4KdvYkVd0vwXh94zK?=
 =?us-ascii?Q?yTIk+HAZbnkMuRrVBEU/5zzN+asF4GMvRxbl2n4vB7w5ZNEnkqP3SAXSktIm?=
 =?us-ascii?Q?pHw1k7Ltj/liLAEE7BFHNcCuia8swopvX1q8GtKqykXrUSSV4yOAwUGTVJgf?=
 =?us-ascii?Q?jMO/NCKiHDDFwufnsHdZDvtcmJseHT12CZlT4O1V+mLKK7nRrDk/bySdviua?=
 =?us-ascii?Q?PsmWj8RblPUpc3JHOogwe0mwSnp62HNhlSOKj0rRnTI2myuoJCvYC0WFmYEe?=
 =?us-ascii?Q?nY3DH/iZtYwvcew7w2GFbx7UwOEkO3OOXq/WjfPdzZ2X+r9HlwjzOTTMAp1C?=
 =?us-ascii?Q?FomSKPcesa6aNl+juOQ/Dx50cl0RU2MGLpOphSO+?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 2f4e60a7-78d7-4d88-7d7e-08dbb607a30a
X-MS-Exchange-CrossTenant-AuthSource: SA1PR11MB6733.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2023 16:20:12.1397
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 4eg9IJbOOE58qx4jGCMRDSkAI42H9tDtw2cGUYIwR9xuxUmg/4uPZwZTpunTE/r0nilOwcca7HcHL1v5GelmKg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR11MB6816
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,
        RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Fri, 15 Sep 2023 09:21:18 -0700 (PDT)

Yu Liao wrote:
> Make use of the struct_size() helper instead of an open-coded version,
> in order to avoid any potential type mistakes or integer overflows that,
> in the worst scenario, could lead to heap overflows.
> 
> Signed-off-by: Yu Liao <liaoyu15@huawei.com>
> Reviewed-by: Dave Jiang <dave.jiang@intel.com>

Reviewed-by: Ira Weiny <ira.weiny@intel.com>

> ---
>  drivers/acpi/nfit/core.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
> index 305f590c54a8..2f7217600307 100644
> --- a/drivers/acpi/nfit/core.c
> +++ b/drivers/acpi/nfit/core.c
> @@ -712,8 +712,7 @@ static bool add_spa(struct acpi_nfit_desc *acpi_desc,
>  		}
>  	}
>  
> -	nfit_spa = devm_kzalloc(dev, sizeof(*nfit_spa) + sizeof_spa(spa),
> -			GFP_KERNEL);
> +	nfit_spa = devm_kzalloc(dev, struct_size(nfit_spa, spa, 1), GFP_KERNEL);
>  	if (!nfit_spa)
>  		return false;
>  	INIT_LIST_HEAD(&nfit_spa->list);
> @@ -741,7 +740,7 @@ static bool add_memdev(struct acpi_nfit_desc *acpi_desc,
>  			return true;
>  		}
>  
> -	nfit_memdev = devm_kzalloc(dev, sizeof(*nfit_memdev) + sizeof(*memdev),
> +	nfit_memdev = devm_kzalloc(dev, struct_size(nfit_memdev, memdev, 1),
>  			GFP_KERNEL);
>  	if (!nfit_memdev)
>  		return false;
> @@ -812,8 +811,7 @@ static bool add_dcr(struct acpi_nfit_desc *acpi_desc,
>  			return true;
>  		}
>  
> -	nfit_dcr = devm_kzalloc(dev, sizeof(*nfit_dcr) + sizeof(*dcr),
> -			GFP_KERNEL);
> +	nfit_dcr = devm_kzalloc(dev, struct_size(nfit_dcr, dcr, 1), GFP_KERNEL);
>  	if (!nfit_dcr)
>  		return false;
>  	INIT_LIST_HEAD(&nfit_dcr->list);
> @@ -855,7 +853,7 @@ static size_t sizeof_idt(struct acpi_nfit_interleave *idt)
>  {
>  	if (idt->header.length < sizeof(*idt))
>  		return 0;
> -	return sizeof(*idt) + sizeof(u32) * idt->line_count;
> +	return struct_size(idt, line_offset, idt->line_count);
>  }
>  
>  static bool add_idt(struct acpi_nfit_desc *acpi_desc,
> -- 
> 2.25.1
>