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

pvs: fix segfaults with orphans

Browse Source 
Several fields used to display 0 if undefined.  Recent changes
to the way the fields are reported threw away some tests for
valid pointers, leading to segfaults with 'pvs -o all'.

Reinstate the original behaviour.
This commit is contained in:
Alasdair G Kergon 2014-01-14 03:17:27 +00:00
parent 4c2b4c37e7
commit 5a450eab6a
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cache/lvmcache.c vendored
View File

@ -1958,6 +1958,9 @@ int lvmcache_uncertain_ownership(struct lvmcache_info *info) {
uint64_t lvmcache_smallest_mda_size(struct lvmcache_info *info)
{
if (!info)
return UINT64_C(0);
return find_min_mda_size(&info->mdas);
}

3
lib/metadata/pv.c
View File

@ -245,7 +245,8 @@ uint64_t lvmcache_info_mda_free(struct lvmcache_info *info)
{
uint64_t freespace = UINT64_MAX;
lvmcache_foreach_mda(info, _pv_mda_free, &freespace);
if (info)
lvmcache_foreach_mda(info, _pv_mda_free, &freespace);
if (freespace == UINT64_MAX)
freespace = UINT64_C(0);

8
lib/report/report.c
View File

@ -693,13 +693,11 @@ static int _devsize_disp(struct dm_report *rh, struct dm_pool *mem,
struct dm_report_field *field,
const void *data, void *private)
{
const struct device *dev = *(const struct device * const *) data;
uint64_t size;
if (!data)
return _field_set_value(field, "", NULL);
if (!dev_get_size(*(const struct device **) data, &size))
return_0;
if (!dev || !dev->dev || !dev_get_size(dev, &size))
size = _zero64;
return _size64_disp(rh, mem, field, &size, private);
}

16
tools/reporter.c
View File

@ -141,8 +141,8 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg,
struct volume_group *old_vg = vg;
char uuid[64] __attribute__((aligned(8)));
struct label *label;
struct label _dummy_label = { .dev = 0 };
struct device _dummy_device = { .dev = 0 };
struct label dummy_label = { .dev = 0 };
struct device dummy_device = { .dev = 0 };
if (is_pv(pv) && !is_orphan(pv) && !vg) {
vg_name = pv_vg_name(pv);
@ -183,14 +183,16 @@ static int _pvs_single(struct cmd_context *cmd, struct volume_group *vg,
/* FIXME workaround for pv_label going through cache; remove once struct
* physical_volume gains a proper "label" pointer */
if (!(label = pv_label(pv))) {
_dummy_label.labeller = pv->fmt->labeller;
if (pv->fmt)
dummy_label.labeller = pv->fmt->labeller;
if (pv->dev)
_dummy_label.dev = pv->dev;
dummy_label.dev = pv->dev;
else {
_dummy_label.dev = &_dummy_device;
memcpy(_dummy_device.pvid, &pv->id, ID_LEN);
dummy_label.dev = &dummy_device;
memcpy(dummy_device.pvid, &pv->id, ID_LEN);
}
label = &_dummy_label;
label = &dummy_label;
}
if (!report_object(handle, vg, NULL, pv, NULL, NULL, label)) {