[PATCH 6.6.y 0/2] Backport for CVE-2025-22121