]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
xen/hvc: Check HVM_PARAM_CONSOLE_[EVTCHN|PFN] for correctness.
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 23 May 2012 16:56:59 +0000 (12:56 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 23 May 2012 18:21:03 +0000 (14:21 -0400)
We need to make sure that those parameters are setup to be correct.
As such the value of 0 is deemed invalid and we find that we
bail out. The hypervisor sets by default all of them to be zero
and when the hypercall is done does a simple:

 a.value = d->arch.hvm_domain.params[a.index];

Which means that if the Xen toolstack forgot to setup the proper
HVM_PARAM_CONSOLE_EVTCHN, we would get the default value of 0
and use that.

CC: stable@kernel.org
Fixes-Oracle-Bug: 14091238
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
drivers/tty/hvc/hvc_xen.c

index 3277f0eec4a704d352e63f196960e71daa62f32b..5fb1cb9889ae04765d2b9fce6402f71acdaaa6a8 100644 (file)
@@ -216,12 +216,12 @@ static int xen_hvm_console_init(void)
                return 0;
 
        r = hvm_get_parameter(HVM_PARAM_CONSOLE_EVTCHN, &v);
-       if (r < 0)
+       if (r < 0 || v == 0)
                goto err;
        info->evtchn = v;
        v = 0;
        r = hvm_get_parameter(HVM_PARAM_CONSOLE_PFN, &v);
-       if (r < 0)
+       if (r < 0 || v == 0)
                goto err;
        mfn = v;
        info->intf = ioremap(mfn << PAGE_SHIFT, PAGE_SIZE);