console: avoid buffer overrun in guest_console_write()
PATCH 1/1 console: avoid buffer overrun in guest_console_write()
conring_puts() has been requiring a nul-terminated string, which the local kbuf[] doesn't get set for anymore. Add a length parameter to the function, just like was done for others, thus allowing embedded nul to also be read through XEN_SYSCTL_readconsole.
While there drop a stray cast: Both operands of - are already uint32_t.
xen/drivers/char/console.c +6 -8
@@ -257,16 +257,14 @@ static void do_dec_thresh(unsigned char* ******************************************************** */ -static void conring_puts (const char *str) +static void conring_puts (const char *str,size_t len) { -char c; -ASSERT (spin_is_locked (&console_lock)); -while ( (c = *str++) !='\0' ) - conring[CONRING_IDX_MASK (conringp++)] = c; +while ( len-- ) + conring[CONRING_IDX_MASK (conringp++)] = *str++; -if ( (uint32_t )(conringp - conringc) > conring_size ) +if ( conringp - conringc > conring_size ) conringc = conringp - conring_size; }
@@ -562,7 +560,7 @@ static long guest_console_write(XEN_GUESif ( opt_console_to_ring ) { -conring_puts (kbuf); +conring_puts (kbuf, kcount);tasklet_schedule (¬ify_dom0_con_ring_tasklet); }
@@ -687,7 +685,7 @@ static void __putstr(const char *str) }#endif -conring_puts (str); +conring_puts (str, len);if ( !console_locks_busted )tasklet_schedule (¬ify_dom0_con_ring_tasklet);
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 10 lines · Jan Beulich
conring_puts()has been requiring a nul-terminated string, which the local kbuf[] doesn't get set for anymore. Add a length parameter to the function, just like was done for others, thus allowing embedded nul to also be read throughXEN_SYSCTL_readconsole.While there drop a stray cast: Both operands of - are already
uint32_t.Fixes ea601ec9995b ("xen/console: Rework HYPERCALL_console_io interface")Reported-by Jürgen Groß <[email protected]>Signed-off-by Jan Beulich <[email protected]>
Juergen
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Hi,
Quoted 8 lines · Jan Beulich
conring_puts()has been requiring a nul-terminated string, which the local kbuf[] doesn't get set for anymore. Add a length parameter to the function, just like was done for others, thus allowing embedded nul to also be read throughXEN_SYSCTL_readconsole.While there drop a stray cast: Both operands of - are already
uint32_t.Fixes ea601ec9995b ("xen/console: Rework HYPERCALL_console_io interface")
Sorry again :(.
Quoted 2 lines
Reported-by Jürgen Groß <[email protected]>Signed-off-by Jan Beulich <[email protected]>
Cheers,
Signature · 6 lines
Julien Grall _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel