[PATCH 5.4/5.10 0/1] Backport fix for CVE-2023-52531