* [PATCH v2] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc()
@ 2025-02-18 1:17 Haoxiang Li
2025-02-18 2:44 ` Kalesh Anakkur Purayil
0 siblings, 1 reply; 3+ messages in thread
From: Haoxiang Li @ 2025-02-18 1:17 UTC (permalink / raw)
To: kuba, louis.peens, andrew+netdev, davem, edumazet, pabeni,
haoxiang_li2024, qmo, daniel
Cc: bpf, oss-drivers, netdev, linux-kernel, stable
Add check for the return value of nfp_app_ctrl_msg_alloc() in
nfp_bpf_cmsg_alloc() to prevent null pointer dereference.
Fixes: ff3d43f7568c ("nfp: bpf: implement helpers for FW map ops")
Cc: stable@vger•kernel.org
Signed-off-by: Haoxiang Li <haoxiang_li2024@163•com>
---
Changes in v2:
- remove the bracket for one single-statement. Thanks, Guru!
---
drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
index 2ec62c8d86e1..b02d5fbb8c8c 100644
--- a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
+++ b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c
@@ -20,6 +20,8 @@ nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bpf, unsigned int size)
struct sk_buff *skb;
skb = nfp_app_ctrl_msg_alloc(bpf->app, size, GFP_KERNEL);
+ if (!skp)
+ return NULL;
skb_put(skb, size);
return skb;
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH v2] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() 2025-02-18 1:17 [PATCH v2] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() Haoxiang Li @ 2025-02-18 2:44 ` Kalesh Anakkur Purayil 2025-02-18 7:56 ` Michal Swiatkowski 0 siblings, 1 reply; 3+ messages in thread From: Kalesh Anakkur Purayil @ 2025-02-18 2:44 UTC (permalink / raw) To: Haoxiang Li Cc: kuba, louis.peens, andrew+netdev, davem, edumazet, pabeni, qmo, daniel, bpf, oss-drivers, netdev, linux-kernel, stable [-- Attachment #1: Type: text/plain, Size: 1317 bytes --] On Tue, Feb 18, 2025 at 6:49 AM Haoxiang Li <haoxiang_li2024@163•com> wrote: > > Add check for the return value of nfp_app_ctrl_msg_alloc() in > nfp_bpf_cmsg_alloc() to prevent null pointer dereference. > > Fixes: ff3d43f7568c ("nfp: bpf: implement helpers for FW map ops") > Cc: stable@vger•kernel.org > Signed-off-by: Haoxiang Li <haoxiang_li2024@163•com> > --- > Changes in v2: > - remove the bracket for one single-statement. Thanks, Guru! > --- > drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c > index 2ec62c8d86e1..b02d5fbb8c8c 100644 > --- a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c > +++ b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c > @@ -20,6 +20,8 @@ nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bpf, unsigned int size) > struct sk_buff *skb; > > skb = nfp_app_ctrl_msg_alloc(bpf->app, size, GFP_KERNEL); > + if (!skp) > + return NULL; It looks like you did not compile this change. Also, next time you push a new version, please modify the subject as: "[PATCH net v3] xxxx" > skb_put(skb, size); > > return skb; > -- > 2.25.1 > > -- Regards, Kalesh AP [-- Attachment #2: S/MIME Cryptographic Signature --] [-- Type: application/pkcs7-signature, Size: 4239 bytes --] ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() 2025-02-18 2:44 ` Kalesh Anakkur Purayil @ 2025-02-18 7:56 ` Michal Swiatkowski 0 siblings, 0 replies; 3+ messages in thread From: Michal Swiatkowski @ 2025-02-18 7:56 UTC (permalink / raw) To: Kalesh Anakkur Purayil Cc: Haoxiang Li, kuba, louis.peens, andrew+netdev, davem, edumazet, pabeni, qmo, daniel, bpf, oss-drivers, netdev, linux-kernel, stable On Tue, Feb 18, 2025 at 08:14:49AM +0530, Kalesh Anakkur Purayil wrote: > On Tue, Feb 18, 2025 at 6:49 AM Haoxiang Li <haoxiang_li2024@163•com> wrote: > > > > Add check for the return value of nfp_app_ctrl_msg_alloc() in > > nfp_bpf_cmsg_alloc() to prevent null pointer dereference. > > > > Fixes: ff3d43f7568c ("nfp: bpf: implement helpers for FW map ops") > > Cc: stable@vger•kernel.org > > Signed-off-by: Haoxiang Li <haoxiang_li2024@163•com> > > --- > > Changes in v2: > > - remove the bracket for one single-statement. Thanks, Guru! > > --- > > drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c > > index 2ec62c8d86e1..b02d5fbb8c8c 100644 > > --- a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c > > +++ b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c > > @@ -20,6 +20,8 @@ nfp_bpf_cmsg_alloc(struct nfp_app_bpf *bpf, unsigned int size) > > struct sk_buff *skb; > > > > skb = nfp_app_ctrl_msg_alloc(bpf->app, size, GFP_KERNEL); > > + if (!skp) > > + return NULL; > It looks like you did not compile this change. > > Also, next time you push a new version, please modify the subject as: > "[PATCH net v3] xxxx" Yeah, you need to send v3 (skp -> skb). Fix looks fine, other call to nfp_app_ctrl_msg_alloc() is checking returned value as here. Feel free to add my RB tag in v3. Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux•intel.com> > > skb_put(skb, size); > > > > return skb; > > -- > > 2.25.1 > > > > > > > -- > Regards, > Kalesh AP ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-02-18 7:59 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-02-18 1:17 [PATCH v2] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() Haoxiang Li 2025-02-18 2:44 ` Kalesh Anakkur Purayil 2025-02-18 7:56 ` Michal Swiatkowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox