| Message ID | 20250218030409.2425798-1-haoxiang_li2024@163.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 878e7b11736e062514e58f3b445ff343e6705537 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v3] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() | expand |
On Tue, Feb 18, 2025 at 8:56 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 v3: > - modify a spell error. Thanks, Kalesh! > 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..59486fe2ad18 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 (!skb) > + return NULL; > skb_put(skb, size); > > return skb; > -- > 2.25.1 > > You should wait 24 hours before posting a new version of the patch. https://docs.kernel.org/process/maintainer-netdev.html#resending-after-review
Hello: This patch was applied to netdev/net.git (main) by Paolo Abeni <pabeni@redhat.com>: On Tue, 18 Feb 2025 11:04:09 +0800 you 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> > > [...] Here is the summary with links: - [net,v3] nfp: bpf: Add check for nfp_app_ctrl_msg_alloc() https://git.kernel.org/netdev/net/c/878e7b11736e You are awesome, thank you!
diff --git a/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c b/drivers/net/ethernet/netronome/nfp/bpf/cmsg.c index 2ec62c8d86e1..59486fe2ad18 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 (!skb) + return NULL; skb_put(skb, size); return skb;
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 v3: - modify a spell error. Thanks, Kalesh! 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(+)