File x86-cmdline-parse-fix.patch of Package xen.11173
xen: Fix backport of "xen/cmdline: Fix buggy strncmp(s, LITERAL, ss - s) construct"
These were missed as a consequence of being rebased over other cmdline
cleanup.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/dom0_build.c
+++ b/xen/arch/x86/dom0_build.c
@@ -303,10 +303,10 @@ static int __init parse_dom0_param(const
if ( !ss )
ss = strchr(s, '\0');
- if ( !strncmp(s, "pvh", ss - s) )
+ if ( !cmdline_strcmp(s, "pvh") )
dom0_pvh = true;
#ifdef CONFIG_SHADOW_PAGING
- else if ( !strncmp(s, "shadow", ss - s) )
+ else if ( !cmdline_strcmp(s, "shadow") )
opt_dom0_shadow = true;
#endif
else
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -90,9 +90,9 @@ static int __init parse_ept_param(const
if ( !ss )
ss = strchr(s, '\0');
- if ( !strncmp(s, "pml", ss - s) )
+ if ( !cmdline_strcmp(s, "pml") )
opt_pml_enabled = val;
- else if ( !strncmp(s, "ad", ss - s) )
+ else if ( !cmdline_strcmp(s, "ad") )
opt_ept_ad = val;
else
rc = -EINVAL;