[PATCH 5.15.y 0/2] Backport fix for CVE-2024-38538