Backport two patches to fix the following CVE. CVE: CVE-2018-18074 Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>