argo: don't leak stack contents when returning ring info
PATCH 1/1 argo: don't leak stack contents when returning ring info
The max_message_size field of the output gets filled only when the flags field is non-zero. Don't copy back uninitialized data to guest context.
xen/common/argo.c +2 -1
@@ -1405,7 +1405,8 @@ fill_ring_data(const struct domain *currrcu_unlock_domain (dst_d);if ( !ret && (__copy_field_to_guest (data_ent_hnd, &ent, flags) || -__copy_field_to_guest (data_ent_hnd, &ent, max_message_size)) ) + (ent.flags && +__copy_field_to_guest (data_ent_hnd, &ent, max_message_size))) )return -EFAULT ;return ret;
Quoted 2 lines · Jan Beulich
The
max_message_sizefield of the output gets filled only when the flags field is non-zero. Don't copy back uninitialized data to guest context.
I'm afraid I'm missing something. AFAICT ent gets filled from the user-space contents of data_ent_hnd that's copied from user-space at the top of the function, so there's no leak from hypervisor stack in the return path?
Thanks, Roger.
Quoted 7 lines · Roger Pau Monné
Quoted 2 lines · Jan Beulich
The
max_message_sizefield of the output gets filled only when the flags field is non-zero. Don't copy back uninitialized data to guest context.I'm afraid I'm missing something. AFAICT ent gets filled from the user-space contents of
data_ent_hndthat's copied from user-space at the top of the function,
Oh, I managed to overlook this multiple time, so ...
Quoted 2 lines
so there's no leak from hypervisor stack in
the return path?
... yes indeed. Withdrawing the patch.
Thanks for noticing,
Jan