Commit 99b415fe authored by Kees Cook's avatar Kees Cook Committed by Jakub Kicinski
Browse files

tg3: Use slab_build_skb() when needed 



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 ce098da1 ("skbuff: Introduce
slab_build_skb()"):

	Use slab_build_skb() instead
	...
	tg3_poll_work+0x638/0xf90 [tg3]

Fixes: ce098da1 ("skbuff: Introduce slab_build_skb()")
Reported-by: default avatarFiona 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: Bagas Sanjaya <bagasdotme@gmail.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarPavan Chebbi <pavan.chebbi@broadcom.com>
Link: https://lore.kernel.org/r/20230818175417.never.273-kees@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent be809424

drivers/net/ethernet/broadcom/tg3.c

+4 −1
Original line number Diff line number Diff line
@@ -6881,7 +6881,10 @@ static int tg3_rx(struct tg3_napi *tnapi, int budget) 


			ri->data = NULL;



			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;