FIX: env: import: hashtable: Prevent buffer overrun when importing environment from file
PATCH 1/2 FIX: env: import: hashtable: Prevent buffer overrun when importing environment from file
Lets consider following scenario:
- One uses echo -n "key=value" to define environment variable in a file (single variable)
- The file content is "key=value" without any terminating byte (e.g. 0x0a or 0x0d).
- The file is loaded to u-boot non zero'ed RAM buffer (with load command).
- Then "env import -t -r $loadaddr $filesize" is executed.
- Due to lack of proper termination byte we have classical example of buffer overrun.
This patch prevents from this by allocating one extra byte than size and explicitly null terminate it.
There should be no change for normal env import operation after applying this patch.
--- lib/hashtable.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
lib/hashtable.c +3 -2
@@ -789,12 +789,13 @@ int himport_r(struct hsearch_data *htab, }/* we allocate new space to make sure we can write to the array */ -if ((data =malloc (size)) ==NULL ) { -debug ("himport_r: can't malloc %zu bytes\n" , size); +if ((data =malloc (size +1 )) ==NULL ) { +debug ("himport_r: can't malloc %zu bytes\n" , size +1 );__set_errno (ENOMEM );return 0 ; }memcpy (data, env, size); + data[size] ='\0' ; dp = data;/* make a local copy of the list of variables */
Signature · 1 line
2.1.4
PATCH 2/2 FIX: env: import: hashtable: Free memory allocated before exiting from himport_r()
Without this patch memory is not released on early exit.
--- lib/hashtable.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
lib/hashtable.c +4 -1
@@ -842,8 +842,10 @@ int himport_r(struct hsearch_data *htab, } } -if (!size) +if (!size) { +free (data);return 1 ;/* everything OK */ + }if (crlf_is_lf) {/* Remove Carriage Returns in front of Line Feeds */ unsigned ignored_crs =0 ;
@@ -907,6 +909,7 @@ int himport_r(struct hsearch_data *htab,if (*name ==0 ) {debug ("INSERT: unable to use an empty key\n" );__set_errno (EINVAL ); +free (data);return 0 ; }
Signature · 1 line
2.1.4
PATCH 2/2 FIX: env: import: hashtable: Free memory allocated before exiting from himport_r()
Quoted 3 lines · Lukasz Majewski
Without this patch memory is not released on early exit.
Signed-off-by Lukasz Majewski <[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: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150915/71eb3d6b/attachment.sig>
PATCH 1/2 FIX: env: import: hashtable: Prevent buffer overrun when importing environment from file
In reply to Lukasz MajewskiQuoted 9 lines · Lukasz Majewski
Lets consider following scenario:
- One uses echo -n "key=value" to define environment variable in a file (single variable)
- The file content is "key=value" without any terminating byte (e.g.0x0aor0x0d).
- The file is loaded to u-boot non zero'ed RAM buffer (with load command).
- Then "env import -t -r $loadaddr $filesize" is executed.
- Due to lack of proper termination byte we have classical example of buffer overrun.
Quoted 7 lines
This patch prevents from this by allocating one extra byte than size and explicitly null terminate it.
There should be no change for normal env import operation after applying this patch.
Signed-off-by Lukasz Majewski <[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: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150915/695a3aa9/attachment.sig>