netdev - Re: [PATCH 1/1] ovpn: use kmalloc_array() for array space allocation

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]

Message-ID: <20250902081812.GQ15473@horms.kernel.org>
Date: Tue, 2 Sep 2025 09:18:12 +0100
From: Simon Horman <horms@...nel.org>
To: chuguangqing <chuguangqing@...pur.com>
Cc: Antonio Quartulli <antonio@...nvpn.net>,
	Sabrina Dubroca <sd@...asysnail.net>,
	Andrew Lunn <andrew+netdev@...n.ch>, davem@...emloft.net,
	Eric Dumazet <edumazet@...gle.com>,
	Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/1] ovpn: use kmalloc_array() for array space allocation

On Mon, Sep 01, 2025 at 07:21:36PM +0800, chuguangqing wrote:
> Replace kmalloc(size * sizeof) with kmalloc_array() for safer memory
> allocation and overflow prevention.
> 
> Signed-off-by: chuguangqing <chuguangqing@...pur.com>
> ---
>  drivers/net/ovpn/crypto_aead.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/ovpn/crypto_aead.c b/drivers/net/ovpn/crypto_aead.c
> index 2cca759feffa..8274c3ae8d0b 100644
> --- a/drivers/net/ovpn/crypto_aead.c
> +++ b/drivers/net/ovpn/crypto_aead.c
> @@ -72,8 +72,8 @@ int ovpn_aead_encrypt(struct ovpn_peer *peer, struct ovpn_crypto_key_slot *ks,
>  		return -ENOSPC;
>  
>  	/* sg may be required by async crypto */
> -	ovpn_skb_cb(skb)->sg = kmalloc(sizeof(*ovpn_skb_cb(skb)->sg) *
> -				       (nfrags + 2), GFP_ATOMIC);
> +	ovpn_skb_cb(skb)->sg = kmalloc_array((nfrags + 2), sizeof(*ovpn_skb_cb(skb)->sg),
> +					     GFP_ATOMIC);

I think this could benefit from:
a) Removal of unnecessary parentheses
b) Line wrapping to 80 columns wide or less,
   as is still preferred for Networking code

(Completely untested!)

	ovpn_skb_cb(skb)->sg = kmalloc_array(nfrags + 2,
					     sizeof(*ovpn_skb_cb(skb)->sg),
					     GFP_ATOMIC);

>  	if (unlikely(!ovpn_skb_cb(skb)->sg))
>  		return -ENOMEM;
>  
> @@ -185,8 +185,8 @@ int ovpn_aead_decrypt(struct ovpn_peer *peer, struct ovpn_crypto_key_slot *ks,
>  		return -ENOSPC;
>  
>  	/* sg may be required by async crypto */
> -	ovpn_skb_cb(skb)->sg = kmalloc(sizeof(*ovpn_skb_cb(skb)->sg) *
> -				       (nfrags + 2), GFP_ATOMIC);
> +	ovpn_skb_cb(skb)->sg = kmalloc_array((nfrags + 2), sizeof(*ovpn_skb_cb(skb)->sg),
> +					     GFP_ATOMIC);

Likewise here.

>  	if (unlikely(!ovpn_skb_cb(skb)->sg))
>  		return -ENOMEM;
>  

-- 
pw-bot: changes-requested