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

clang: avoid double free on error path

Browse Source 
Error path in _lockd_retrive_vg_pv_list() has not zeroed released path
caussing possible double-free later in the code.

Fix it by using one single function freeing lock_pvs structure.
This commit is contained in:
Zdenek Kabelac 2021-09-14 18:00:22 +02:00
parent 8935dfee56
commit 9c5d2874a7
1 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/locking/lvmlockd.c
View File

@ -232,6 +232,18 @@ static int _lockd_retrive_vg_pv_num(struct volume_group *vg)
return num; return num;
} }
static void _lockd_free_pv_list(struct lvmlockd_pvs *lock_pvs)
{
int i;
for (i = 0; i < lock_pvs->num; i++)
free(lock_pvs->path[i]);
free(lock_pvs->path);
lock_pvs->path = NULL;
lock_pvs->num = 0;
}
static void _lockd_retrive_vg_pv_list(struct volume_group *vg, static void _lockd_retrive_vg_pv_list(struct volume_group *vg,
struct lvmlockd_pvs *lock_pvs) struct lvmlockd_pvs *lock_pvs)
{ {
@ -269,13 +281,7 @@ static void _lockd_retrive_vg_pv_list(struct volume_group *vg,
return; return;
fail: fail:
for (i = 0; i < pv_num; i++) { _lockd_free_pv_list(lock_pvs);
if (!lock_pvs->path[i])
continue;
free(lock_pvs->path[i]);
}
free(lock_pvs->path);
return;
} }
static int _lockd_retrive_lv_pv_num(struct volume_group *vg, static int _lockd_retrive_lv_pv_num(struct volume_group *vg,
@ -327,7 +333,7 @@ static void _lockd_retrive_lv_pv_list(struct volume_group *vg,
} }
/* Allocate buffer for PV list */ /* Allocate buffer for PV list */
lock_pvs->path = malloc(sizeof(*lock_pvs->path) * pv_num); lock_pvs->path = zalloc(sizeof(*lock_pvs->path) * pv_num);
if (!lock_pvs->path) { if (!lock_pvs->path) {
log_error("Fail to allocate PV list for %s/%s", vg->name, lv_name); log_error("Fail to allocate PV list for %s/%s", vg->name, lv_name);
return; return;
@ -352,30 +358,7 @@ static void _lockd_retrive_lv_pv_list(struct volume_group *vg,
return; return;
fail: fail:
for (i = 0; i < pv_num; i++) { _lockd_free_pv_list(lock_pvs);
if (!lock_pvs->path[i])
continue;
free(lock_pvs->path[i]);
lock_pvs->path[i] = NULL;
}
free(lock_pvs->path);
lock_pvs->path = NULL;
lock_pvs->num = 0;
return;
}
static void _lockd_free_pv_list(struct lvmlockd_pvs *lock_pvs)
{
int i;
for (i = 0; i < lock_pvs->num; i++) {
free(lock_pvs->path[i]);
lock_pvs->path[i] = NULL;
}
free(lock_pvs->path);
lock_pvs->path = NULL;
lock_pvs->num = 0;
} }
/* /*