mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-02 04:15:46 +00:00
lxc: fix lxcContainerMountAllFS() DEREF_BEFORE_CHECK
vmDef->fss[i]->src->path may be NULL,
so check is needed before passing it to VIR_DEBUG.
Also removed checking vmDef->fss[i]->src for NULL, since it may not be NULL.
Fixes: 57487085dc
("lxc: don't try to reference NULL when mounting filesystems")
Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
bc06cfa1cd
commit
8ff149516f
@ -1467,12 +1467,13 @@ static int lxcContainerMountAllFS(virDomainDef *vmDef,
|
|||||||
if (STREQ(vmDef->fss[i]->dst, "/"))
|
if (STREQ(vmDef->fss[i]->dst, "/"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
VIR_DEBUG("Mounting '%s' -> '%s'", vmDef->fss[i]->src->path, vmDef->fss[i]->dst);
|
VIR_DEBUG("Mounting '%s' -> '%s'", NULLSTR(vmDef->fss[i]->src->path),
|
||||||
|
vmDef->fss[i]->dst);
|
||||||
|
|
||||||
if (lxcContainerResolveSymlinks(vmDef->fss[i], false) < 0)
|
if (lxcContainerResolveSymlinks(vmDef->fss[i], false) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
if (!(vmDef->fss[i]->src && vmDef->fss[i]->src->path &&
|
if (!(vmDef->fss[i]->src->path &&
|
||||||
STRPREFIX(vmDef->fss[i]->src->path, vmDef->fss[i]->dst)) &&
|
STRPREFIX(vmDef->fss[i]->src->path, vmDef->fss[i]->dst)) &&
|
||||||
lxcContainerUnmountSubtree(vmDef->fss[i]->dst, false) < 0)
|
lxcContainerUnmountSubtree(vmDef->fss[i]->dst, false) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
|
Loading…
Reference in New Issue
Block a user