lib/display_options: avoid illegal memory access
PATCH 1/1 lib/display_options: avoid illegal memory access
display_options_get_banner_priv() overwrites bytes before the start of the buffer if the buffer size is less then 3. This case occurs in the Sandbox when executing the ut_print command.
Correctly handle small buffer sizes. Adjust the print unit test to catch when bytes before the buffer are overwritten.
---
I will take the patch via the u-boot-efi repository.
--- lib/display_options.c | 4 +++- test/print_ut.c | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)
lib/display_options.c +3 -1
@@ -23,7 +23,9 @@ char *display_options_get_banner_priv(bool newlines, const char *build_tag, build_tag);if (len > size -3 ) len = size -3 ; -strcpy (buf + len,"\n\n" ); +if (len <0 ) + len =0 ; +snprintf (buf + len, size - len,"\n\n" );return buf; }
test/print_ut.c +12 -8
@@ -79,14 +79,18 @@ static int do_ut_print(cmd_tbl_t *cmdtp, int flag, int argc,assert (s == str);assert (!strcmp ("\n\nU-Boo\n\n" , s)); - s =display_options_get_banner (true, str,1 ); -assert (s == str); -assert (!strcmp ("" , s)); - - s =display_options_get_banner (true, str,2 ); -assert (s == str); -assert (!strcmp ("\n" , s)); - +/* Assert that we do not overwrite memory before the buffer */ + str[0 ] ='`' ; + s =display_options_get_banner (true, str +1 ,1 ); +assert (s == str +1 ); +assert (!strcmp ("`" , str)); + + str[0 ] ='~' ; + s =display_options_get_banner (true, str +1 ,2 ); +assert (s == str +1 ); +assert (!strcmp ("~\n" , str)); + +/* The last two characters are set to \n\n for all buffer sizes > 2 */ s =display_options_get_banner (false, str,sizeof (str));assert (s == str);assert (!strcmp ("U-Boot \n\n" , s));
--
2.20.1
PATCH 1/1 lib/display_options: avoid illegal memory access
Quoted 8 lines · Heinrich Schuchardt
display_options_get_banner_priv()overwrites bytes before the start of the buffer if the buffer size is less then 3. This case occurs in the Sandbox when executing theut_printcommand.Correctly handle small buffer sizes. Adjust the print unit test to catch when bytes before the buffer are overwritten.
Quoted 8 lines
Signed-off-by Heinrich Schuchardt <[email protected]>---
I will take the patch via the u-boot-efi repository.--- lib/display_options.c | 4 +++- test/print_ut.c | 20 ++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)
PATCH 1/1 lib/display_options: avoid illegal memory access
In reply to Heinrich SchuchardtQuoted 9 lines · Heinrich Schuchardt
display_options_get_banner_priv()overwrites bytes before the start of the buffer if the buffer size is less then 3. This case occurs in the Sandbox when executing theut_printcommand.Correctly handle small buffer sizes. Adjust the print unit test to catch when bytes before the buffer are overwritten.
Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190506/c0267ff3/attachment.sig>