Security fix for CVE-2023-31137, CVE-2022-30256