Commit 69663091 authored by Pavel Tikhomirov's avatar Pavel Tikhomirov Committed by Andrei Vagin

mount: fix segmentation fault in can_mount_now on no mnt_master

In resolve_shared_mounts there are cases when we have m->master_id > 0
but m->mnt_master is not set, it happens for cases where we have no
access to master mount, for instance CT root m->parent==NULL or when
mount is external. In can_mount_now  for such master mounts we don't
need to check mounted state also, so just use "if(mi->mnt_master)"
condition instead of "if(mi->master_id > 0)" to fix segfault.

https://jira.sw.ru/browse/PSBM-86978

Program terminated with signal 11, Segmentation fault.
0x000000000046328b in can_mount_now (mi=0x2155970) at criu/mount.c:2699
2699	list_for_each_entry(c, &mi->mnt_master->children, siblings)

(gdb) p mi->mnt_master
$2 = (struct mount_info	*) 0x0

Fixes commit 3a02362c5be1 ("mount: fix can_mount_now to wait children of
master's share properly")
Signed-off-by: 's avatarPavel Tikhomirov <ptikhomirov@virtuozzo.com>
Signed-off-by: 's avatarAndrei Vagin <avagin@virtuozzo.com>
parent bab6c7b7
......@@ -2355,7 +2355,7 @@ static bool can_mount_now(struct mount_info *mi)
* - Make sure all children of master's share are
* mounted as well to eliminate mounts duplications
*/
if (mi->master_id > 0) {
if (mi->mnt_master) {
struct mount_info *c, *s;
if (mi->bind == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment