From: Minghao Chi (CGEL ZTE) Date: Wed, 16 Feb 2022 03:08:41 +0000 (+0000) Subject: iwlwifi/fw: use struct_size over open coded arithmetic X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1132f6de0b857ee57fb3cb01bcdbe24db5e6dd46;p=linux.git iwlwifi/fw: use struct_size over open coded arithmetic Replace zero-length array with flexible-array member and make use of the struct_size() helper in kzalloc(). Reported-by: Zeal Robot Signed-off-by: Minghao Chi (CGEL ZTE) Link: https://lore.kernel.org/r/20220216030841.1839666-1-chi.minghao@zte.com.cn Signed-off-by: Luca Coelho --- diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c index 022bc2bf44023..1083922345293 100644 --- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c +++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c @@ -2749,7 +2749,7 @@ int iwl_fw_dbg_collect(struct iwl_fw_runtime *fwrt, delay = le32_to_cpu(trigger->stop_delay) * USEC_PER_MSEC; } - desc = kzalloc(sizeof(*desc) + len, GFP_ATOMIC); + desc = kzalloc(struct_size(desc, trig_desc.data, len), GFP_ATOMIC); if (!desc) return -ENOMEM;