[v2] wifi: cfg80211: Use kmemdup_array instead of kmemdup for multiple allocation

[PATCH v2] wifi: cfg80211: Use kmemdup_array instead of kmemdup for multiple allocation

Posted by Yu Jiaoliang 1 year, 5 months ago

Let the kememdup_array() take care about multiplication and possible
overflows.

v2:
-Change sizeof(limits[0]) to sizeof(*limits)
-Fix title prefix

Signed-off-by: Yu Jiaoliang <yujiaoliang@vivo.com>
Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Kalle Valo <kvalo@kernel.org>
---
 net/wireless/util.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index 9a7c3adc8a3b..e7c1ac2a0f2d 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -2435,8 +2435,8 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
 		if (params->num_different_channels > c->num_different_channels)
 			continue;
 
-		limits = kmemdup(c->limits, sizeof(limits[0]) * c->n_limits,
-				 GFP_KERNEL);
+		limits = kmemdup_array(c->limits, c->n_limits, sizeof(*limits),
+				       GFP_KERNEL);
 		if (!limits)
 			return -ENOMEM;
 
-- 
2.34.1

Re: [PATCH v2] wifi: cfg80211: Use kmemdup_array instead of kmemdup for multiple allocation

Posted by Kalle Valo 1 year, 5 months ago

Yu Jiaoliang <yujiaoliang@vivo.com> writes:

> Let the kememdup_array() take care about multiplication and possible
> overflows.
>
> v2:
> -Change sizeof(limits[0]) to sizeof(*limits)
> -Fix title prefix
>
> Signed-off-by: Yu Jiaoliang <yujiaoliang@vivo.com>
> Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> Reviewed-by: Kalle Valo <kvalo@kernel.org>

No, I did not review your patch. Do not add any tags (like Reviewed-by)
unless a person gives you that in a reply.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH v2] wifi: cfg80211: Use kmemdup_array instead of kmemdup for multiple allocation

Posted by Christophe JAILLET 1 year, 5 months ago

Le 21/08/2024 à 13:12, Yu Jiaoliang a écrit :
> Let the kememdup_array() take care about multiplication and possible
> overflows.
> 
> v2:
> -Change sizeof(limits[0]) to sizeof(*limits)
> -Fix title prefix

Hi,

this kind of information about differences between versions is usually 
below the ---.

> 
> Signed-off-by: Yu Jiaoliang <yujiaoliang@vivo.com>
> Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

It is not because someone makes a comment on a patch that you should 
automatically add a R-b tag.

> Reviewed-by: Kalle Valo <kvalo@kernel.org>
> ---
>   net/wireless/util.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/net/wireless/util.c b/net/wireless/util.c
> index 9a7c3adc8a3b..e7c1ac2a0f2d 100644
> --- a/net/wireless/util.c
> +++ b/net/wireless/util.c
> @@ -2435,8 +2435,8 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,
>   		if (params->num_different_channels > c->num_different_channels)
>   			continue;
>   
> -		limits = kmemdup(c->limits, sizeof(limits[0]) * c->n_limits,
> -				 GFP_KERNEL);
> +		limits = kmemdup_array(c->limits, c->n_limits, sizeof(*limits),
> +				       GFP_KERNEL);
>   		if (!limits)
>   			return -ENOMEM;
>   

Reviewed-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

Now you can add my R-b :).

CJ