[PATCH 0/2] Backport fix of CVE-2024-36923 to 6.1 and 6.6