migration: Fix possible access out of bounds
v2 cover migration: Fix possible access out of bounds
Fix the issue detected by Coverity in format_time_str() and move the function into the generic utils as suggested.
v2:
- Fix the incorrect loop condition.
- Make the array static and fix argument name in signature.
Fabiano Rosas (3):
migration: HMP: Fix possible out-of-bounds access
migration: HMP: Fix postcopy latency distribution label
cutils: Add time_us_to_str
include/qemu/cutils.h | 1 + migration/migration-hmp-cmds.c | 19 ++----------------- util/cutils.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-)
Signature · 1 line
2.35.3
PATCH v2 1/3 migration: HMP: Fix possible out-of-bounds access
Coverity has caught a bug in the formatting of time intervals for postcopy latency distribution display in 'info migrate'.
While bounds checking the labels array, sizeof is incorrectly being used. ARRAY_SIZE is the correct form of obtaining the size of an array.
Resolves: Coverity CID 1612248
--- migration/migration-hmp-cmds.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
migration/migration-hmp-cmds.c +2 -4
@@ -57,11 +57,9 @@ static const gchar *format_time_str(uint64_t us)const char *units[] = {"us" ,"ms" ,"sec" };int index =0 ; -while (us >1000 ) { +while (us >1000 && index +1 <ARRAY_SIZE (units)) { us /=1000 ; -if (++index >= (sizeof (units) -1 )) { -break ; - } + index++; }return g_strdup_printf ("%" PRIu64" %s" , us, units[index]);
Signature · 1 line
2.35.3
PATCH v2 2/3 migration: HMP: Fix postcopy latency distribution label
In reply to Fabiano RosasFix the loop condition to avoid having a label with "1000 us" instead of "1 ms".
--- migration/migration-hmp-cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
migration/migration-hmp-cmds.c +1 -1
@@ -57,7 +57,7 @@ static const gchar *format_time_str(uint64_t us)const char *units[] = {"us" ,"ms" ,"sec" };int index =0 ; -while (us >1000 && index +1 <ARRAY_SIZE (units)) { +while (us >=1000 && index +1 <ARRAY_SIZE (units)) { us /=1000 ; index++; }
Signature · 1 line
2.35.3
Re: [PATCH v2 2/3] migration: HMP: Fix postcopy latency distribution label
Quoted 8 lines · Fabiano Rosas
Fix the loop condition to avoid having a label with "1000 us" instead of "1 ms".
Reported-by Prasad Pandit <[email protected]>Signed-off-by Fabiano Rosas <[email protected]>--- migration/migration-hmp-cmds.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Good catch.
PATCH v2 3/3 cutils: Add time_us_to_str
In reply to Fabiano RosasThe migration code has a function that converts a time value (us) to a string with the proper suffix. Move it to cutils since it's generic enough that it could be reused.
--- include/qemu/cutils.h | 1 + migration/migration-hmp-cmds.c | 17 ++--------------- util/cutils.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 15 deletions(-)
include/qemu/cutils.h +1 -0
@@ -171,6 +171,7 @@ int qemu_strtosz_MiB(const char *nptr, const char **end, uint64_t *result);int qemu_strtosz_metric (const char *nptr,const char **end,uint64_t *result);char *size_to_str (uint64_t val); +char *time_us_to_str (uint64_t us);/** * freq_to_str:
migration/migration-hmp-cmds.c +2 -15
@@ -52,19 +52,6 @@ static void migration_global_dump(Monitor *mon) ms->clear_bitmap_shift); } -static const gchar *format_time_str (uint64_t us) -{ -const char *units[] = {"us" ,"ms" ,"sec" }; -int index =0 ; - -while (us >=1000 && index +1 <ARRAY_SIZE (units)) { - us /=1000 ; - index++; - } - -return g_strdup_printf ("%" PRIu64" %s" , us, units[index]); -} -static void migration_dump_blocktime (Monitor *mon,MigrationInfo *info) {if (info->has_postcopy_blocktime) {
@@ -121,8 +108,8 @@ static void migration_dump_blocktime(Monitor *mon, MigrationInfo *info)monitor_printf (mon,"Postcopy Latency Distribution:\n" );while (item) { - g_autofree const gchar *from = format_time_str(1UL << count); - g_autofree const gchar *to = format_time_str(1UL << (count + 1)); + g_autofree const gchar *from = time_us_to_str(1UL << count); + g_autofree const gchar *to = time_us_to_str(1UL << (count + 1));monitor_printf (mon," [ %8s - %8s ]: %10" PRIu64"\n" , from, to, item->value);
util/cutils.c +13 -0
@@ -1004,6 +1004,19 @@ char *freq_to_str(uint64_t freq_hz)return g_strdup_printf ("%0.3g %sHz" , freq,si_prefix (exp10)); } +char *time_us_to_str (uint64_t us) +{ +static const char *units[] = {"us" ,"ms" ,"sec" }; +int index =0 ; + +while (us >=1000 && index +1 <ARRAY_SIZE (units)) { + us /=1000 ; + index++; + } + +return g_strdup_printf ("%" PRIu64" %s" , us, units[index]); +} +int qemu_pstrcmp0 (const char **str1,const char **str2) {return g_strcmp0 (*str1, *str2);
Signature · 1 line
2.35.3
Quoted 12 lines · Fabiano Rosas
Fix the issue detected by Coverity in
format_time_str()and move the function into the generic utils as suggested.v2:
- Fix the incorrect loop condition.
- Make the array static and fix argument name in signature.Fabiano Rosas (3):
migration: HMP: Fix possible out-of-bounds access
migration: HMP: Fix postcopy latency distribution label
cutils: Addtime_us_to_str
Quoted 4 lines
include/qemu/cutils.h | 1 + migration/migration-hmp-cmds.c | 19 ++----------------- util/cutils.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-)
Queued patches 1 & 2.
Patch 3 can go along with Daniel's suggestion of unifying all the helpers that add string labels to a number.