1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

cov: use safer version with size limitation

Although there is likely not much risk of having chance of overwritting
given buffers use safer variant.
Use dm_strncpy() when just copying %s.
This commit is contained in:
Zdenek Kabelac 2024-04-09 11:36:31 +02:00
parent 3ce83f923d
commit e7a54c1a50
3 changed files with 6 additions and 6 deletions

View File

@ -385,7 +385,7 @@ char *dm_build_dm_uuid(struct dm_pool *mem, const char *uuid_prefix, const char
return NULL; return NULL;
} }
sprintf(dmuuid, "%s%s%s%s", uuid_prefix, lvid, (*layer) ? "-" : "", layer); snprintf(dmuuid, len, "%s%s%s%s", uuid_prefix, lvid, (*layer) ? "-" : "", layer);
return dmuuid; return dmuuid;
} }
@ -552,7 +552,7 @@ const char *dm_size_to_string(struct dm_pool *mem, uint64_t size,
if (size == UINT64_C(0)) { if (size == UINT64_C(0)) {
if (base == BASE_UNKNOWN) if (base == BASE_UNKNOWN)
s = 0; s = 0;
sprintf(size_buf, "0%s", include_suffix ? size_str[base + s][suffix_type] : ""); snprintf(size_buf, SIZE_BUF, "0%s", include_suffix ? size_str[base + s][suffix_type] : "");
return size_buf; return size_buf;
} }

View File

@ -385,7 +385,7 @@ char *dm_build_dm_uuid(struct dm_pool *mem, const char *uuid_prefix, const char
return NULL; return NULL;
} }
sprintf(dmuuid, "%s%s%s%s", uuid_prefix, lvid, (*layer) ? "-" : "", layer); snprintf(dmuuid, len, "%s%s%s%s", uuid_prefix, lvid, (*layer) ? "-" : "", layer);
return dmuuid; return dmuuid;
} }
@ -552,7 +552,7 @@ const char *dm_size_to_string(struct dm_pool *mem, uint64_t size,
if (size == UINT64_C(0)) { if (size == UINT64_C(0)) {
if (base == BASE_UNKNOWN) if (base == BASE_UNKNOWN)
s = 0; s = 0;
sprintf(size_buf, "0%s", include_suffix ? size_str[base + s][suffix_type] : ""); snprintf(size_buf, SIZE_BUF, "0%s", include_suffix ? size_str[base + s][suffix_type] : "");
return size_buf; return size_buf;
} }

View File

@ -938,9 +938,9 @@ static int _lvchange_writemostly(struct logical_volume *lv,
if ((tmp_str_len < 3) || if ((tmp_str_len < 3) ||
(tmp_str[tmp_str_len - 2] != ':')) (tmp_str[tmp_str_len - 2] != ':'))
/* Default to 'y' if no mode specified */ /* Default to 'y' if no mode specified */
sprintf(pv_names[i], "%s:y", tmp_str); snprintf(pv_names[i], tmp_str_len + 3, "%s:y", tmp_str);
else else
sprintf(pv_names[i], "%s", tmp_str); dm_strncpy(pv_names[i], tmp_str, tmp_str_len + 3);
i++; i++;
} }