tty: xtensa/iss: use strnlen to improve iss_console_write
PATCH 1/1 tty: xtensa/iss: use strnlen to improve iss_console_write
Use strnlen() to limit scanning 's' to 'count' bytes. Use the length of 's' to decide if simc_write() should be called instead of dereferencing it first and then calling strlen().
With strnlen(), iss_console_write() is further hardened against callers where 's' is not NUL-terminated.
Signed-off-by Thorsten Blum <[email protected]>
--- arch/xtensa/platforms/iss/console.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
arch/xtensa/platforms/iss/console.c +3 -2
@@ -166,8 +166,9 @@ late_initcall(rs_init);static void iss_console_write (struct console *co,const char *s,unsigned count) { -if (s && *s !=0 ) -simc_write (1 , s,min (count,strlen (s))); + count = s ?strnlen (s, count) :0 ; +if (count) +simc_write (1 , s, count); }static struct tty_driver *iss_console_device (struct console *c,int *index)
Max Filippov
maintainerQuoted 5 lines · Thorsten Blum
Use
strnlen()to limit scanning 's' to 'count' bytes. Use the length of 's' to decide ifsimc_write()should be called instead of dereferencing it first and then callingstrlen().
Quoted 7 lines
With
strnlen(),iss_console_write()is further hardened against callers where 's' is not NUL-terminated.Signed-off-by Thorsten Blum <[email protected]>--- arch/xtensa/platforms/iss/console.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
Thanks. Applied to my xtensa tree.
-- Max