APPLIED: [SRU][F][PATCH v2 0/1] CVE-2024-35958

[Koichiro Den]

On Sat, Feb 22, 2025 at 12:38:05PM GMT, Tim Whisonant wrote:
> [Impact]
> 
> net: ena: Fix incorrect descriptor free behavior
> 
> Adding a check for XDP traffic in ena_free_tx_bufs() so that XDP buffers
> are not errantly sent to napi_consume_skb(). This prevents a bug related
> to VF reset, which resulted in a system crash.
> 
> [Cherry Pick]
> 
> Cherry picked from commit bf02d9fe00632d22fa91d34749c7aacf397b6cde
> 
> [Fix]
> 
> Oracular:   Not affected
> Noble:      Fixed upstream
> Jammy:      Fixed upstream
> Focal:      Cherry picked from linux-6.9
> Bionic:     Not affected
> Xenial:     Not affected
> Trusty:     Not affected
> 
> [Test Plan]
> 
> Compile and boot tested only.
> 
> [Where problems could occur]
> 
> The change is isolated to the Elastic Network Adapater driver,
> specifically the TX queue logic.
> 
> [Notes]
> 
> v2 - Remove CVE handle from top of patch file
> 
> David Arinzon (1):
>   net: ena: Fix incorrect descriptor free behavior
> 
>  drivers/net/ethernet/amazon/ena/ena_netdev.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 

Applied to focal:linux master-next branch. Thanks!