| Message ID | 1459337665-29319-1-git-send-email-paul.durrant@citrix.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
>>> On 30.03.16 at 13:34, <paul.durrant@citrix.com> wrote: > --- a/xen/arch/x86/mm.c > +++ b/xen/arch/x86/mm.c > @@ -589,7 +589,8 @@ static inline void guest_get_eff_kern_l1e(struct vcpu *v, unsigned long addr, > TOGGLE_MODE(); > } > > -static const char __section(".bss.page_aligned.const") zero_page[PAGE_SIZE]; > +static const char __section(".bss.page_aligned.const") __zero_page[PAGE_SIZE]; > +const char *zero_page = __zero_page; Mind explaining why simply dropping the "static" doesn't do what we want? Jan
> -----Original Message----- > From: Jan Beulich [mailto:JBeulich@suse.com] > Sent: 30 March 2016 14:15 > To: Paul Durrant > Cc: Andrew Cooper; xen-devel@lists.xenproject.org; Keir (Xen.org) > Subject: Re: [PATCH v3] x86/hvm/viridian: zero and check vcpu context > __pad field > > >>> On 30.03.16 at 13:34, <paul.durrant@citrix.com> wrote: > > --- a/xen/arch/x86/mm.c > > +++ b/xen/arch/x86/mm.c > > @@ -589,7 +589,8 @@ static inline void guest_get_eff_kern_l1e(struct > vcpu *v, unsigned long addr, > > TOGGLE_MODE(); > > } > > > > -static const char __section(".bss.page_aligned.const") > zero_page[PAGE_SIZE]; > > +static const char __section(".bss.page_aligned.const") > __zero_page[PAGE_SIZE]; > > +const char *zero_page = __zero_page; > > Mind explaining why simply dropping the "static" doesn't do what we > want? > That's what I did first. I got: mm.c:592:56: error: conflicting types for âzero_pageâ static const char __section(".bss.page_aligned.const") zero_page[PAGE_SIZE]; ^ In file included from /local/scratch/pauldu/xen/xen/include/xen/mm.h:195:0, from mm.c:90: /local/scratch/pauldu/xen/xen/include/asm/mm.h:598:20: note: previous declaration of âzero_pageâ was here extern const char *zero_page; ^ /local/scratch/pauldu/xen/xen/Rules.mk:166: recipe for target 'mm.o' failed Paul > Jan
>>> On 30.03.16 at 15:18, <Paul.Durrant@citrix.com> wrote: >> -----Original Message----- >> From: Jan Beulich [mailto:JBeulich@suse.com] >> Sent: 30 March 2016 14:15 >> To: Paul Durrant >> Cc: Andrew Cooper; xen-devel@lists.xenproject.org; Keir (Xen.org) >> Subject: Re: [PATCH v3] x86/hvm/viridian: zero and check vcpu context >> __pad field >> >> >>> On 30.03.16 at 13:34, <paul.durrant@citrix.com> wrote: >> > --- a/xen/arch/x86/mm.c >> > +++ b/xen/arch/x86/mm.c >> > @@ -589,7 +589,8 @@ static inline void guest_get_eff_kern_l1e(struct >> vcpu *v, unsigned long addr, >> > TOGGLE_MODE(); >> > } >> > >> > -static const char __section(".bss.page_aligned.const") >> zero_page[PAGE_SIZE]; >> > +static const char __section(".bss.page_aligned.const") >> __zero_page[PAGE_SIZE]; >> > +const char *zero_page = __zero_page; >> >> Mind explaining why simply dropping the "static" doesn't do what we >> want? >> > > That's what I did first. I got: > > mm.c:592:56: error: conflicting types for âzero_pageâ > static const char __section(".bss.page_aligned.const") > zero_page[PAGE_SIZE]; > ^ > In file included from /local/scratch/pauldu/xen/xen/include/xen/mm.h:195:0, > from mm.c:90: > /local/scratch/pauldu/xen/xen/include/asm/mm.h:598:20: note: previous > declaration of âzero_pageâ was here > extern const char *zero_page; > ^ > /local/scratch/pauldu/xen/xen/Rules.mk:166: recipe for target 'mm.o' failed Obviously this can't work: You meant extern const char zero_page[]; Jan
> -----Original Message----- > From: Xen-devel [mailto:xen-devel-bounces@lists.xen.org] On Behalf Of Jan > Beulich > Sent: 30 March 2016 15:23 > To: Paul Durrant > Cc: Andrew Cooper; Keir (Xen.org); xen-devel@lists.xenproject.org > Subject: Re: [Xen-devel] [PATCH v3] x86/hvm/viridian: zero and check vcpu > context __pad field > > >>> On 30.03.16 at 15:18, <Paul.Durrant@citrix.com> wrote: > >> -----Original Message----- > >> From: Jan Beulich [mailto:JBeulich@suse.com] > >> Sent: 30 March 2016 14:15 > >> To: Paul Durrant > >> Cc: Andrew Cooper; xen-devel@lists.xenproject.org; Keir (Xen.org) > >> Subject: Re: [PATCH v3] x86/hvm/viridian: zero and check vcpu context > >> __pad field > >> > >> >>> On 30.03.16 at 13:34, <paul.durrant@citrix.com> wrote: > >> > --- a/xen/arch/x86/mm.c > >> > +++ b/xen/arch/x86/mm.c > >> > @@ -589,7 +589,8 @@ static inline void guest_get_eff_kern_l1e(struct > >> vcpu *v, unsigned long addr, > >> > TOGGLE_MODE(); > >> > } > >> > > >> > -static const char __section(".bss.page_aligned.const") > >> zero_page[PAGE_SIZE]; > >> > +static const char __section(".bss.page_aligned.const") > >> __zero_page[PAGE_SIZE]; > >> > +const char *zero_page = __zero_page; > >> > >> Mind explaining why simply dropping the "static" doesn't do what we > >> want? > >> > > > > That's what I did first. I got: > > > > mm.c:592:56: error: conflicting types for âzero_pageâ > > static const char __section(".bss.page_aligned.const") > > zero_page[PAGE_SIZE]; > > ^ > > In file included from > /local/scratch/pauldu/xen/xen/include/xen/mm.h:195:0, > > from mm.c:90: > > /local/scratch/pauldu/xen/xen/include/asm/mm.h:598:20: note: previous > > declaration of âzero_pageâ was here > > extern const char *zero_page; > > ^ > > /local/scratch/pauldu/xen/xen/Rules.mk:166: recipe for target 'mm.o' > failed > > Obviously this can't work: You meant > > extern const char zero_page[]; > Yes, I guess I did. Paul > Jan > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel
diff --git a/xen/arch/x86/hvm/viridian.c b/xen/arch/x86/hvm/viridian.c index 5c76c1a..165f58e 100644 --- a/xen/arch/x86/hvm/viridian.c +++ b/xen/arch/x86/hvm/viridian.c @@ -785,6 +785,8 @@ static int viridian_save_domain_ctxt(struct domain *d, hvm_domain_context_t *h) if ( !is_viridian_domain(d) ) return 0; + memset(&ctxt, 0, sizeof(ctxt)); + ctxt.time_ref_count = d->arch.hvm_domain.viridian.time_ref_count.val; ctxt.hypercall_gpa = d->arch.hvm_domain.viridian.hypercall_gpa.raw; ctxt.guest_os_id = d->arch.hvm_domain.viridian.guest_os_id.raw; @@ -824,6 +826,8 @@ static int viridian_save_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) for_each_vcpu( d, v ) { struct hvm_viridian_vcpu_context ctxt; + memset(&ctxt, 0, sizeof(ctxt)); + ctxt.apic_assist_msr = v->arch.hvm_vcpu.viridian.apic_assist.msr.raw; ctxt.apic_assist_vector = v->arch.hvm_vcpu.viridian.apic_assist.vector; @@ -851,6 +855,9 @@ static int viridian_load_vcpu_ctxt(struct domain *d, hvm_domain_context_t *h) if ( hvm_load_entry_zeroextend(VIRIDIAN_VCPU, h, &ctxt) != 0 ) return -EINVAL; + if ( memcmp(&ctxt._pad, zero_page, sizeof(ctxt._pad)) ) + return -EINVAL; + v->arch.hvm_vcpu.viridian.apic_assist.msr.raw = ctxt.apic_assist_msr; if ( v->arch.hvm_vcpu.viridian.apic_assist.msr.fields.enabled ) initialize_apic_assist(v); diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index c997b53..b8b41fa 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -589,7 +589,8 @@ static inline void guest_get_eff_kern_l1e(struct vcpu *v, unsigned long addr, TOGGLE_MODE(); } -static const char __section(".bss.page_aligned.const") zero_page[PAGE_SIZE]; +static const char __section(".bss.page_aligned.const") __zero_page[PAGE_SIZE]; +const char *zero_page = __zero_page; static void invalidate_shadow_ldt(struct vcpu *v, int flush) { @@ -4562,7 +4563,7 @@ void destroy_gdt(struct vcpu *v) { l1_pgentry_t *pl1e; unsigned int i; - unsigned long pfn, zero_pfn = PFN_DOWN(__pa(zero_page)); + unsigned long pfn, zero_pfn = PFN_DOWN(__pa(__zero_page)); v->arch.pv_vcpu.gdt_ents = 0; pl1e = gdt_ldt_ptes(v->domain, v); diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h index b25942b..01553ab 100644 --- a/xen/include/asm-x86/mm.h +++ b/xen/include/asm-x86/mm.h @@ -595,4 +595,6 @@ typedef struct mm_rwlock { &(d)->xenpage_list : &(d)->page_list, \ &(d)->arch.relmem_list) +extern const char *zero_page; + #endif /* __ASM_X86_MM_H__ */
Commit 57844631 "save APIC assist vector" added an extra field to the viridian vcpu context save record. This field was only a uint8_t and so an extra __pad field was also added to pad up to the next 64-bit boundary. This patch makes sure that __pad field is zeroed on save and checked for zero on restore. This prevents a potential leak of information from the stack and a compatibility check against future use of the space occupied by the __pad field. This patch also adds a memset to make sure that the viridian domain context is fully zeroed. This is not strictly necessary but helps make the code more robust if fields are added to that struct in future. Signed-off-by: Paul Durrant <paul.durrant@citrix.com> Cc: Keir Fraser <keir@xen.org> Cc: Jan Beulich <jbeulich@suse.com> Cc: Andrew Cooper <andrew.cooper3@citrix.com> --- v3: - make zero_page accessible outside mm.c v2: - drop is_zero() helper an use memcmp against zero_page instead. - add memset to viridian_save_domain_ctxt() to reduce potential for information leakage in future. --- xen/arch/x86/hvm/viridian.c | 7 +++++++ xen/arch/x86/mm.c | 5 +++-- xen/include/asm-x86/mm.h | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-)