| Message ID | 20230818175417.never.273-kees@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 99b415fe8986803ba0eaf6b8897b16edc8fe7ec2 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | tg3: Use slab_build_skb() when needed | expand |
On Fri, Aug 18, 2023 at 11:24 PM Kees Cook <keescook@chromium.org> wrote: > > The tg3 driver will use kmalloc() under some conditions. Check the > frag_size and use slab_build_skb() when frag_size is 0. Silences > the warning introduced by commit ce098da1497c ("skbuff: Introduce > slab_build_skb()"): > > Use slab_build_skb() instead > ... > tg3_poll_work+0x638/0xf90 [tg3] > > Reported-by: Fiona Ebner <f.ebner@proxmox.com> > Closes: https://lore.kernel.org/all/1bd4cb9c-4eb8-3bdb-3e05-8689817242d1@proxmox.com > Cc: Siva Reddy Kallam <siva.kallam@broadcom.com> > Cc: Prashant Sreedharan <prashant@broadcom.com> > Cc: Michael Chan <mchan@broadcom.com> > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Paolo Abeni <pabeni@redhat.com> > Cc: Bagas Sanjaya <bagasdotme@gmail.com> > Cc: netdev@vger.kernel.org > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > drivers/net/ethernet/broadcom/tg3.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index 5ef073a79ce9..cb2810f175cc 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -6881,7 +6881,10 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) > > ri->data = NULL; > > - skb = build_skb(data, frag_size); > + if (frag_size) > + skb = build_skb(data, frag_size); > + else > + skb = slab_build_skb(data); > if (!skb) { > tg3_frag_free(frag_size != 0, data); > goto drop_it_no_recycle; > -- > 2.34.1 > > Thanks. LGTM. Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 18 Aug 2023 10:54:21 -0700 you wrote: > The tg3 driver will use kmalloc() under some conditions. Check the > frag_size and use slab_build_skb() when frag_size is 0. Silences > the warning introduced by commit ce098da1497c ("skbuff: Introduce > slab_build_skb()"): > > Use slab_build_skb() instead > ... > tg3_poll_work+0x638/0xf90 [tg3] > > [...] Here is the summary with links: - tg3: Use slab_build_skb() when needed https://git.kernel.org/netdev/net/c/99b415fe8986 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index 5ef073a79ce9..cb2810f175cc 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c @@ -6881,7 +6881,10 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) ri->data = NULL; - skb = build_skb(data, frag_size); + if (frag_size) + skb = build_skb(data, frag_size); + else + skb = slab_build_skb(data); if (!skb) { tg3_frag_free(frag_size != 0, data); goto drop_it_no_recycle;
The tg3 driver will use kmalloc() under some conditions. Check the frag_size and use slab_build_skb() when frag_size is 0. Silences the warning introduced by commit ce098da1497c ("skbuff: Introduce slab_build_skb()"): Use slab_build_skb() instead ... tg3_poll_work+0x638/0xf90 [tg3] Reported-by: Fiona Ebner <f.ebner@proxmox.com> Closes: https://lore.kernel.org/all/1bd4cb9c-4eb8-3bdb-3e05-8689817242d1@proxmox.com Cc: Siva Reddy Kallam <siva.kallam@broadcom.com> Cc: Prashant Sreedharan <prashant@broadcom.com> Cc: Michael Chan <mchan@broadcom.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: Bagas Sanjaya <bagasdotme@gmail.com> Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> --- drivers/net/ethernet/broadcom/tg3.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)