shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Proper dm_snprintf return checks

Browse Source
This commit is contained in:
Heinz Mauelshagen 2017-05-24 14:00:44 +02:00
parent 3da5cdc5dc
commit 65b10281f8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/metadata/raid_manip.c
View File

@ -1017,8 +1017,8 @@ static struct logical_volume *_alloc_image_component(struct logical_volume *lv,
return 0; return 0;
} }
if (!dm_snprintf(img_name, sizeof(img_name), "%s_%s_%%d", if (dm_snprintf(img_name, sizeof(img_name), "%s_%s_%%d",
(alt_base_name) ? : lv->name, type_suffix)) { (alt_base_name) ? : lv->name, type_suffix) < 0) {
log_error("Component name for raid %s is too long.", display_lvname(lv)); log_error("Component name for raid %s is too long.", display_lvname(lv));
return 0; return 0;
} }
@ -4483,7 +4483,7 @@ static const char *_get_segtype_alias_str(const struct logical_volume *lv, const
char *buf = dm_pool_alloc(lv->vg->cmd->mem, sz); char *buf = dm_pool_alloc(lv->vg->cmd->mem, sz);
if (buf) if (buf)
alias = dm_snprintf(buf, sz, "%s%s)", msg, alias) ? buf : ""; alias = (dm_snprintf(buf, sz, "%s%s)", msg, alias) < 0) ? "" : buf;
} }
return alias; return alias;
@ -4769,7 +4769,7 @@ static int _rename_area_lvs(struct logical_volume *lv, const char *suffix)
/* Create _generate_raid_name() suffixes w/ or w/o passed in @suffix */ /* Create _generate_raid_name() suffixes w/ or w/o passed in @suffix */
for (s = 0; s < SLV_COUNT; s++) for (s = 0; s < SLV_COUNT; s++)
if (!(sfx[s] = dm_pool_alloc(lv->vg->cmd->mem, sz)) || if (!(sfx[s] = dm_pool_alloc(lv->vg->cmd->mem, sz)) ||
!dm_snprintf(sfx[s], sz, suffix ? "%s%s" : "%s", s ? "rmeta" : "rimage", suffix)) dm_snprintf(sfx[s], sz, suffix ? "%s%s" : "%s", s ? "rmeta" : "rimage", suffix) < 0)
return_0; return_0;
/* Change names (temporarily) to be able to shift numerical name suffixes */ /* Change names (temporarily) to be able to shift numerical name suffixes */
@ -4964,8 +4964,8 @@ static int _takeover_downconvert_wrapper(TAKEOVER_FN_ARGS)
} }
if (seg->area_count > 2) { if (seg->area_count > 2) {
if (!dm_snprintf(res_str, sizeof(res_str), " losing %s resilience", if (dm_snprintf(res_str, sizeof(res_str), " losing %s resilience",
segtype_is_striped(new_segtype) ? "all" : "some")) segtype_is_striped(new_segtype) ? "all" : "some") < 0)
return_0; return_0;
} else } else
*res_str = '\0'; *res_str = '\0';
@ -6080,7 +6080,7 @@ static int _conversion_options_allowed(const struct lv_segment *seg_from,
if (!(fmt = dm_pool_alloc(seg_from->lv->vg->cmd->mem, sz))) if (!(fmt = dm_pool_alloc(seg_from->lv->vg->cmd->mem, sz)))
return_0; return_0;
if (!dm_snprintf(fmt, sz, "%s%s%s", basic_fmt, (seg_from->segtype == *segtype_to) ? "" : type_fmt, question_fmt)) { if (dm_snprintf(fmt, sz, "%s%s%s", basic_fmt, (seg_from->segtype == *segtype_to) ? "" : type_fmt, question_fmt) < 0) {
log_error(INTERNAL_ERROR "dm_snprintf failed."); log_error(INTERNAL_ERROR "dm_snprintf failed.");
return_0; return_0;
} }