[Intel-wired-lan] [PATCH iwl-net v2] idpf: fix corrupted frames and skb leaks in singleq mode

[Register, Scott]

> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces at osuosl.org> On Behalf Of
> Alexander Lobakin
> Sent: Monday, December 11, 2023 4:32 AM
> To: intel-wired-lan at lists.osuosl.org
> Cc: Fijalkowski, Maciej <maciej.fijalkowski at intel.com>; Kitszel, Przemyslaw
> <przemyslaw.kitszel at intel.com>; linux-kernel at vger.kernel.org; Lobakin,
> Aleksander <aleksander.lobakin at intel.com>; Eric Dumazet
> <edumazet at google.com>; Kubiak, Michal <michal.kubiak at intel.com>;
> Simon Horman <horms at kernel.org>; netdev at vger.kernel.org; Jakub
> Kicinski <kuba at kernel.org>; Paolo Abeni <pabeni at redhat.com>; David S.
> Miller <davem at davemloft.net>
> Subject: [Intel-wired-lan] [PATCH iwl-net v2] idpf: fix corrupted frames and
> skb leaks in singleq mode
> 
> idpf_ring::skb serves only for keeping an incomplete frame between
> several NAPI Rx polling cycles, as one cycle may end up before
> processing the end of packet descriptor. The pointer is taken from
> the ring onto the stack before entering the loop and gets written
> there after the loop exits. When inside the loop, only the onstack
> pointer is used.
> For some reason, the logics is broken in the singleq mode, where the
> pointer is taken from the ring each iteration. This means that if a
> frame got fragmented into several descriptors, each fragment will have
> its own skb, but only the last one will be passed up the stack
> (containing garbage), leaving the rest leaked.
> Then, on ifdown, rxq::skb is being freed only in the splitq mode, while
> it can point to a valid skb in singleq as well. This can lead to a yet
> another skb leak.
> Just don't touch the ring skb field inside the polling loop, letting
> the onstack skb pointer work as expected: build a new skb if it's the
> first frame descriptor and attach a frag otherwise. On ifdown, free
> rxq::skb unconditionally if the pointer is non-NULL.
> 
> Fixes: a5ab9ee0df0b ("idpf: add singleq start_xmit and napi poll")
> Reviewed-by: Przemek Kitszel <przemyslaw.kitszel at intel.com>
> Reviewed-by: Michal Kubiak <michal.kubiak at intel.com>
> Reviewed-by: Simon Horman <horms at kernel.org>
> Reviewed-by: Eric Dumazet <edumazet at google.com>
> Signed-off-by: Alexander Lobakin <aleksander.lobakin at intel.com>
> ---
> Tony, please add it to dev-queue instead of the first revision.
> 
> From v1[0]:
> * fix the related skb leak on ifdown;
> * fix subject prefix;
> * pick Reviewed-bys.
> 
> [0] https://lore.kernel.org/all/20231201143821.1091005-1-
> aleksander.lobakin at intel.com
> ---
>  drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c | 1 -
>  drivers/net/ethernet/intel/idpf/idpf_txrx.c         | 2 +-
>  2 files changed, 1 insertion(+), 2 deletions(-)

Tested-by: Scott Register <scott.register at intel.com>