Protect Xen against accessing NULL-pointer triggered by Xenoprof Hypercall in dom0
PATCH 1/1 Protect Xen against accessing NULL-pointer triggered by Xenoprof Hypercall in dom0
Xenoprof Hypercall in dom0 could trigger Xen accessing NULL-pointer and results in fatal page fault. The patch prevents it.
Thanks,
Xiaowei
xen/common/xenoprof.c +17 -12
@@ -681,6 +681,8 @@ int do_xenoprof_op(int op, XEN_GUEST_HAN {case XENOPROF_init: ret =xenoprof_op_init (arg); +if ( !ret ) + xenoprof_state =XENOPROF_INITIALIZED ;break ;case XENOPROF_get_buffer:
@@ -693,21 +695,19 @@ int do_xenoprof_op(int op, XEN_GUEST_HANbreak ;case XENOPROF_reset_active_list: - {reset_active_list (); ret =0 ;break ; - } +case XENOPROF_reset_passive_list: - {reset_passive_list (); ret =0 ;break ; - } +case XENOPROF_set_active: {domid_t domid; -if ( xenoprof_state !=XENOPROF_IDLE ) +if ( xenoprof_state !=XENOPROF_INITIALIZED ) { ret = -EPERM ;break ;
@@ -720,18 +720,18 @@ int do_xenoprof_op(int op, XEN_GUEST_HAN ret =add_active_list (domid);break ; } +case XENOPROF_set_passive: - { -if ( xenoprof_state !=XENOPROF_IDLE ) +if ( xenoprof_state !=XENOPROF_INITIALIZED ) { ret = -EPERM ;break ; } ret =add_passive_list (arg);break ; - } +case XENOPROF_reserve_counters: -if ( xenoprof_state !=XENOPROF_IDLE ) +if ( xenoprof_state !=XENOPROF_INITIALIZED ) { ret = -EPERM ;break ;
@@ -748,7 +748,6 @@ int do_xenoprof_op(int op, XEN_GUEST_HAN ret = -EPERM ;break ; } - ret =xenoprof_arch_counter (arg);break ;
@@ -766,8 +765,14 @@ int do_xenoprof_op(int op, XEN_GUEST_HANcase XENOPROF_enable_virq: {int i; +if ( current->domain == xenoprof_primary_profiler ) { +if ( xenoprof_state !=XENOPROF_READY ) + { + ret = -EPERM ; +break ; + }xenoprof_arch_enable_virq ();xenoprof_reset_stat ();for ( i =0 ; i < pdomains; i++ )
@@ -835,7 +840,7 @@ int do_xenoprof_op(int op, XEN_GUEST_HANif ( (xenoprof_state ==XENOPROF_COUNTERS_RESERVED ) || (xenoprof_state ==XENOPROF_READY ) ) { - xenoprof_state =XENOPROF_IDLE ; + xenoprof_state =XENOPROF_INITIALIZED ;xenoprof_arch_release_counters ();xenoprof_arch_disable_virq ();reset_passive_list ();
@@ -845,7 +850,7 @@ int do_xenoprof_op(int op, XEN_GUEST_HANcase XENOPROF_shutdown: ret = -EPERM ; -if ( xenoprof_state ==XENOPROF_IDLE ) +if ( xenoprof_state ==XENOPROF_INITIALIZED ) { activated =0 ; adomains=0 ;
xen/include/xen/xenoprof.h +4 -3
@@ -19,9 +19,10 @@#define XENOPROF_DOMAIN_PASSIVE 2#define XENOPROF_IDLE 0 -#define XENOPROF_COUNTERS_RESERVED 1 -#define XENOPROF_READY 2 -#define XENOPROF_PROFILING 3 +#define XENOPROF_INITIALIZED 1 +#define XENOPROF_COUNTERS_RESERVED 2 +#define XENOPROF_READY 3 +#define XENOPROF_PROFILING 4#ifndef CONFIG_COMPAT typedef struct xenoprof_buf xenoprof_buf_t ;
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel
Xiaowei,
Could you please clarify what is the NULL pointer problem that you want to prevent with this patch? Thanks
Renato
Quoted 18 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Yang, Xiaowei
Sent: Tuesday, January 20, 2009 8:28 PM
To: [email protected]
Subject: [Xen-devel] [PATCH] Protect Xen against accessing NULL-pointer triggered by Xenoprof Hypercall in dom0Xenoprof Hypercall in dom0 could trigger Xen accessing NULL-pointer and results in fatal page fault. The patch prevents it.
Signed-off-by Xiaowei Yang <[email protected]>Thanks,
Xiaowei
Quoted 5 lines · Jose Renato G
Xiaowei,
Could you please clarify what is the NULL pointer problem that you want to prevent with this patch? Thanks
Oh, let me put more details. For late coming CPUs that Xenoprof doesn't support yet, pointers cpu_type and model could be unassigned at init time and remains as NULL. However almost all Xenoprof internal functions doesn't check it before using. If the hyercall handler doesn't take care of it, dom0 could exploit it (e.g. XENOPROF_reserve_counters) to trigger Xen NULL-pointer access.
Thanks,
Xiaowei
Quoted 20 lines
Renato
Quoted 18 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Yang, Xiaowei
Sent: Tuesday, January 20, 2009 8:28 PM
To: [email protected]
Subject: [Xen-devel] [PATCH] Protect Xen against accessing NULL-pointer triggered by Xenoprof Hypercall in dom0Xenoprof Hypercall in dom0 could trigger Xen accessing NULL-pointer and results in fatal page fault. The patch prevents it.
Signed-off-by Xiaowei Yang <[email protected]>Thanks,
Xiaowei
Thanks Xiaowei
Yes, that makes sense.
I guess it is good to prevent dom0 misbehavior to crash the system. The patch looks good to me
Thanks
Renato
Quoted 49 lines
-----Original Message-----
From: Yang, Xiaowei [mailto:[email protected]]
Sent: Wednesday, January 21, 2009 4:50 PM
To: Santos, Jose Renato G
Cc: [email protected]
Subject: Re: [Xen-devel] [PATCH] Protect Xen against accessing NULL-pointer triggered by Xenoprof Hypercall in dom0Quoted 3 lines · Jose Renato G
Xiaowei,
Could you please clarify what is the NULL pointer problem
that you want to prevent with this patch?
Quoted 2 lines
Thanks
Oh, let me put more details. For late coming CPUs that Xenoprof doesn't support yet, pointers
cpu_typeand model could be unassigned at init time and remains as NULL. However almost all Xenoprof internal functions doesn't check it before using. If the hyercall handler doesn't take care of it, dom0 could exploit it (e.g.XENOPROF_reserve_counters) to trigger Xen NULL-pointer access.Thanks,
XiaoweiQuoted 12 lines
Renato
Quoted 10 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Yang, Xiaowei
Sent: Tuesday, January 20, 2009 8:28 PM
To: [email protected]
Subject: [Xen-devel] [PATCH] Protect Xen against accessing NULL-pointer triggered by Xenoprof Hypercall in dom0Xenoprof Hypercall in dom0 could trigger Xen accessing
NULL-pointer
Quoted 8 lines
Quoted 8 lines
and results in fatal page fault. The patch prevents it.
Signed-off-by Xiaowei Yang <[email protected]>Thanks,
Xiaowei