shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 18:55:19 +03:00
Code Releases Activity

cleanup: use NAME_LEN stack buffer

Browse Source 
Using NAME_LEN we get at least easy max LV name size validation.
Also code gets more simple.
This commit is contained in:
Zdenek Kabelac 2016-12-11 12:19:38 +01:00
parent 6cd68c55dd
commit dc7d3dd5ed
1 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/metadata/mirror.c
View File

@ -661,6 +661,7 @@ static int _split_mirror_images(struct logical_volume *lv,
struct dm_list split_images;
struct lv_list *lvl;
struct cmd_context *cmd = lv->vg->cmd;
char layer_name[NAME_LEN], format[NAME_LEN];
if (!lv_is_mirrored(lv)) {
log_error("Unable to split non-mirrored LV %s.",
@ -728,9 +729,6 @@ static int _split_mirror_images(struct logical_volume *lv,
}
if (!dm_list_empty(&split_images)) {
size_t len = strlen(new_lv->name) + 32;
char *layer_name, format[len];
/*
* A number of images have been split and
* a new mirror layer must be formed
@ -747,23 +745,21 @@ static int _split_mirror_images(struct logical_volume *lv,
dm_list_iterate_items(lvl, &split_images) {
sub_lv = lvl->lv;
if (dm_snprintf(format, len, "%s_mimage_%%d",
if (dm_snprintf(format, sizeof(format), "%s_mimage_%%d",
new_lv->name) < 0) {
log_error("Failed to build new image name for %s.",
display_lvname(new_lv));
return 0;
}
if (!(layer_name = dm_pool_alloc(lv->vg->vgmem, len))) {
log_error("Unable to allocate memory.");
return 0;
}
if (!generate_lv_name(lv->vg, format, layer_name, len)||
sscanf(layer_name, format, &i) != 1) {
if (!generate_lv_name(lv->vg, format, layer_name, sizeof(layer_name))) {
log_error("Failed to generate new image names for %s.",
display_lvname(new_lv));
return 0;
}
sub_lv->name = layer_name;
if (!(sub_lv->name = dm_pool_strdup(lv->vg->vgmem, layer_name))) {
log_error("Unable to allocate memory.");
return 0;
}
}
if (!_merge_mirror_images(new_lv, &split_images)) {
@ -1403,15 +1399,11 @@ static int _create_mimage_lvs(struct alloc_handle *ah,
int log)
{
uint32_t m, first_area;
char *img_name;
size_t len;
len = strlen(lv->name) + 32;
img_name = alloca(len);
char img_name[NAME_LEN];
if (dm_snprintf(img_name, len, "%s_mimage_%%d", lv->name) < 0) {
log_error("img_name allocation failed. "
"Remove new LV and retry.");
if (dm_snprintf(img_name, sizeof(img_name), "%s_mimage_%%d", lv->name) < 0) {
log_error("Failed to build new mirror image name for %s.",
display_lvname(lv));
return 0;
}
@ -1784,14 +1776,10 @@ static struct logical_volume *_create_mirror_log(struct logical_volume *lv,
const char *suffix)
{
struct logical_volume *log_lv;
char *log_name;
size_t len;
char log_name[NAME_LEN];
len = strlen(lv_name) + 32;
log_name = alloca(len); /* alloca never fails */
if (dm_snprintf(log_name, len, "%s%s", lv_name, suffix) < 0) {
log_error("log_name allocation failed.");
if (dm_snprintf(log_name, sizeof(log_name), "%s%s", lv_name, suffix) < 0) {
log_error("Failed to build new mirror log name for %s.", lv_name);
return NULL;
}