linux-hardening - Re: [PATCH] ath11k: Replace one-element array with flexible-array member

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sun, 12 Sep 2021 14:42:39 -0500
From:   "Gustavo A. R. Silva" <gustavo@...eddedor.com>
To:     "Gustavo A. R. Silva" <gustavoars@...nel.org>,
        Len Baker <len.baker@....com>
Cc:     Kalle Valo <kvalo@...eaurora.org>,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Kees Cook <keescook@...omium.org>, ath11k@...ts.infradead.org,
        linux-wireless@...r.kernel.org, netdev@...r.kernel.org,
        linux-hardening@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] ath11k: Replace one-element array with flexible-array
 member



On 9/12/21 14:31, Gustavo A. R. Silva wrote:
> 
> There is already a patch for this:
> 
> https://lore.kernel.org/lkml/20210823172159.GA25800@embeddedor/
> 
> which I will now add to my -next tree.

Well, in this case I think it's much better if Kalle can take it. :)

--
Gustavo
> On Sat, Sep 04, 2021 at 01:49:37PM +0200, Len Baker wrote:
>> There is a regular need in the kernel to provide a way to declare having
>> a dynamically sized set of trailing elements in a structure. Kernel code
>> should always use "flexible array members"[1] for these cases. The older
>> style of one-element or zero-length arrays should no longer be used[2].
>>
>> Also, refactor the code a bit to make use of the struct_size() helper in
>> kzalloc().
>>
>> [1] https://en.wikipedia.org/wiki/Flexible_array_member
>> [2] https://www.kernel.org/doc/html/v5.14/process/deprecated.html#zero-length-and-one-element-arrays
>>
>> Signed-off-by: Len Baker <len.baker@....com>
>> ---
>>  drivers/net/wireless/ath/ath11k/reg.c | 7 ++-----
>>  drivers/net/wireless/ath/ath11k/wmi.h | 2 +-
>>  2 files changed, 3 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/net/wireless/ath/ath11k/reg.c b/drivers/net/wireless/ath/ath11k/reg.c
>> index e1a1df169034..c83d265185f1 100644
>> --- a/drivers/net/wireless/ath/ath11k/reg.c
>> +++ b/drivers/net/wireless/ath/ath11k/reg.c
>> @@ -97,7 +97,6 @@ int ath11k_reg_update_chan_list(struct ath11k *ar)
>>  	struct channel_param *ch;
>>  	enum nl80211_band band;
>>  	int num_channels = 0;
>> -	int params_len;
>>  	int i, ret;
>>
>>  	bands = hw->wiphy->bands;
>> @@ -117,10 +116,8 @@ int ath11k_reg_update_chan_list(struct ath11k *ar)
>>  	if (WARN_ON(!num_channels))
>>  		return -EINVAL;
>>
>> -	params_len = sizeof(struct scan_chan_list_params) +
>> -			num_channels * sizeof(struct channel_param);
>> -	params = kzalloc(params_len, GFP_KERNEL);
>> -
>> +	params = kzalloc(struct_size(params, ch_param, num_channels),
>> +			 GFP_KERNEL);
>>  	if (!params)
>>  		return -ENOMEM;
>>
>> diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
>> index d35c47e0b19d..d9c83726f65d 100644
>> --- a/drivers/net/wireless/ath/ath11k/wmi.h
>> +++ b/drivers/net/wireless/ath/ath11k/wmi.h
>> @@ -3608,7 +3608,7 @@ struct wmi_stop_scan_cmd {
>>  struct scan_chan_list_params {
>>  	u32 pdev_id;
>>  	u16 nallchans;
>> -	struct channel_param ch_param[1];
>> +	struct channel_param ch_param[];
>>  };
>>
>>  struct wmi_scan_chan_list_cmd {
>> --
>> 2.25.1
>>