[PATCH 5.10.y 0/1] Backport fix for CVE-2024-49935