[PATCH v3 OLK-6.6 0/2] Fix CVE-2024-43869