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

fix dev_name use in add_areas_line

Browse Source 
This function was relying on dev_name() returning NULL
to indicate no device, but dev_name never returns NULL.
This commit is contained in:
David Teigland 2023-04-24 15:47:45 -05:00
parent afc02ae6e7
commit 31cfcf7ce9
1 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/activate/dev_manager.c
View File

@ -3000,34 +3000,47 @@ static int _add_error_area(struct dev_manager *dm, struct dm_tree_node *node,
return 1; return 1;
} }
static int _bad_pv_area(struct lv_segment *seg, uint32_t s)
{
struct stat info;
const char *name;
struct device *dev;
if (!seg_pvseg(seg, s))
return 1;
if (!seg_pv(seg, s))
return 1;
if (!(dev = seg_dev(seg, s)))
return 1;
if (dm_list_empty(&dev->aliases))
return 1;
/* FIXME Avoid repeating identical stat in dm_tree_node_add_target_area */
name = dev_name(dev);
if (stat(name, &info) < 0)
return 1;
if (!S_ISBLK(info.st_mode))
return 1;
return 0;
}
int add_areas_line(struct dev_manager *dm, struct lv_segment *seg, int add_areas_line(struct dev_manager *dm, struct lv_segment *seg,
struct dm_tree_node *node, uint32_t start_area, struct dm_tree_node *node, uint32_t start_area,
uint32_t areas) uint32_t areas)
{ {
struct cmd_context *cmd = seg->lv->vg->cmd;
uint64_t extent_size = seg->lv->vg->extent_size; uint64_t extent_size = seg->lv->vg->extent_size;
uint32_t s; uint32_t s;
char *dlid; char *dlid;
struct stat info;
const char *name; const char *name;
unsigned num_error_areas = 0; unsigned num_error_areas = 0;
unsigned num_existing_areas = 0; unsigned num_existing_areas = 0;
/* FIXME Avoid repeating identical stat in dm_tree_node_add_target_area */
for (s = start_area; s < areas; s++) { for (s = start_area; s < areas; s++) {
if (((seg_type(seg, s) == AREA_PV) && _bad_pv_area(seg, s)) ||
/* FIXME: dev_name() does not return NULL! It needs to check if dm_list_empty(&dev->aliases) ((seg_type(seg, s) == AREA_LV) && !seg_lv(seg, s))) {
but this knot of logic is too complex to pull apart without careful deconstruction. */ if (!cmd->partial_activation) {
if (!cmd->degraded_activation || !lv_is_raid_type(seg->lv)) {
if ((seg_type(seg, s) == AREA_PV && log_error("Aborting. LV %s is incomplete and --activationmode partial was not specified.",
(!seg_pvseg(seg, s) || !seg_pv(seg, s) || !seg_dev(seg, s) ||
!(name = dev_name(seg_dev(seg, s))) || !*name ||
stat(name, &info) < 0 || !S_ISBLK(info.st_mode))) ||
(seg_type(seg, s) == AREA_LV && !seg_lv(seg, s))) {
if (!seg->lv->vg->cmd->partial_activation) {
if (!seg->lv->vg->cmd->degraded_activation ||
!lv_is_raid_type(seg->lv)) {
log_error("Aborting. LV %s is now incomplete "
"and '--activationmode partial' was not specified.",
display_lvname(seg->lv)); display_lvname(seg->lv));
return 0; return 0;
} }