[PATCH v6.6.y 0/2] Backport fixes for CVE-2025-40149