[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20250902090051.1451-1-chuguangqing@inspur.com>
Date: Tue, 2 Sep 2025 17:00:50 +0800
From: chuguangqing <chuguangqing@...pur.com>
To: <horms@...nel.org>, 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>
CC: <netdev@...r.kernel.org>, <linux-kernel@...r.kernel.org>, chuguangqing
<chuguangqing@...pur.com>
Subject: PATCH v2 Re: Re: [PATCH 1/1] ovpn: use kmalloc_array() for array space allocation
v1 -> v2:
Unnecessary parentheses have been removed and line alignment has been adjusted to 80 characters in width.
>
> 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
chuguangqing (1):
ovpn: use kmalloc_array() for array space allocation
drivers/net/ovpn/crypto_aead.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
--
2.43.5
Powered by blists - more mailing lists