Skip to content

net/mlx5e: Use a memory barrier to enforce PTP WQ xmit submission tracking occurs after populating the metadata_map

Kamal Heib requested to merge kheib/centos-stream-9:34192 into main

JIRA: https://issues.redhat.com/browse/RHEL-34192
CVE: CVE-2024-26858

commit b7cf07586c40f926063d4d09f7de28ff82f62b2a
Author: Rahul Rameshbabu rrameshbabu@nvidia.com
Date: Mon Feb 5 13:12:28 2024 -0800

net/mlx5e: Use a memory barrier to enforce PTP WQ xmit submission tracking occurs after populating the metadata_map  

Just simply reordering the functions mlx5e_ptp_metadata_map_put and  
mlx5e_ptpsq_track_metadata in the mlx5e_txwqe_complete context is not good  
enough since both the compiler and CPU are free to reorder these two  
functions. If reordering does occur, the issue that was supposedly fixed by  
7e3f3ba97e6c ("net/mlx5e: Track xmit submission to PTP WQ after populating  
metadata map") will be seen. This will lead to NULL pointer dereferences in  
mlx5e_ptpsq_mark_ts_cqes_undelivered in the NAPI polling context due to the  
tracking list being populated before the metadata map.  

Fixes: 7e3f3ba97e6c ("net/mlx5e: Track xmit submission to PTP WQ after populating metadata map")  
Signed-off-by: Rahul Rameshbabu <rrameshbabu@nvidia.com>  
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>  
CC: Vadim Fedorenko <vadfed@meta.com>

Signed-off-by: Kamal Heib kheib@redhat.com

Merge request reports