[PATCH 0/2] more fixes about CVE-2020-8648