Skip to content

Commit e95534e

Browse files
xinli-intelIngo Molnar
authored andcommitted
x86/xen/msr: Fix uninitialized variable 'err'
xen_read_msr_safe() currently passes an uninitialized argument 'err' to xen_do_read_msr(). But as xen_do_read_msr() may not set the argument, xen_read_msr_safe() could return err with an unpredictable value. To ensure correctness, initialize err to 0 (representing success) in xen_read_msr_safe(). Do the same in xen_read_msr(), even err is not used after being passed to xen_do_read_msr(). Closes: https://lore.kernel.org/xen-devel/[email protected]/ Reported-by: Dan Carpenter <[email protected]> Signed-off-by: Xin Li (Intel) <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Cc: H. Peter Anvin <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 9220aa8 commit e95534e

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/xen/enlighten_pv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ static void xen_do_write_msr(u32 msr, u64 val, int *err)
11621162

11631163
static int xen_read_msr_safe(u32 msr, u64 *val)
11641164
{
1165-
int err;
1165+
int err = 0;
11661166

11671167
*val = xen_do_read_msr(msr, &err);
11681168
return err;
@@ -1179,7 +1179,7 @@ static int xen_write_msr_safe(u32 msr, u64 val)
11791179

11801180
static u64 xen_read_msr(u32 msr)
11811181
{
1182-
int err;
1182+
int err = 0;
11831183

11841184
return xen_do_read_msr(msr, xen_msr_safe ? &err : NULL);
11851185
}

0 commit comments

Comments
 (0)