[PATCH 0/2 v5.10] Fix CVE-2021-47498