On 9/7/23 11:04, Dmitry Frolov wrote:
> 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 <[email protected]>
> ---
> src/lxc/lxc_container.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
> index 21220661f7..9601061b23 100644
> --- a/src/lxc/lxc_container.c
> +++ b/src/lxc/lxc_container.c
> @@ -1467,12 +1467,12 @@ static int lxcContainerMountAllFS(virDomainDef *vmDef,
> if (STREQ(vmDef->fss[i]->dst, "/"))
> 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);
Nitpick, this is long enough line that can be easily broken into two.
>
> if (lxcContainerResolveSymlinks(vmDef->fss[i], false) < 0)
> 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)) &&
> lxcContainerUnmountSubtree(vmDef->fss[i]->dst, false) < 0)
> return -1;
Reviewed-by: Michal Privoznik <[email protected]>
and pushed.
Michal
