[CRIU] [PATCH v2] criu: fix segfault in pre-dump

[Andrei Vagin]

Applied, thanks!

On Wed, Sep 12, 2018 at 08:37:36AM +0200, Adrian Reber wrote:
> From: Adrian Reber <areber at redhat.com>
> 
> By accident I found a segfault using pre-dump in combination with the
> page-server. Doing the following I was able to trigger it:
> 
>  * criu page-server -D /tmp/1
>  * criu pre-dump -t PID -D /tmp/3 --track-mem
>  * criu page-server -D /tmp/4 --prev-images-dir ../1
>  * criu pre-dump -t PID -D /tmp/3 --track-mem
>  --> segfault
> 
> ...
> (00.010090) Warn  (criu/image.c:134): Failed to open parent directory
> ...
> (00.012984) Error (criu/mem.c:318): Pid-reuse detection failed: no parent inventory, check warnings in get_parent_stats
> ...
> (00.013037) Error (criu/mem.c:544): Can't dump page with parasite
> ...
> (00.013955) Pre-dumping tasks' memory
> (00.013966) 	Pre-dumping 8793
> (00.014380) Transferring pages:
> Segmentation fault (core dumped)
> 
> Looking in cr-dump.c at cr_pre_dump_finish(int ret) the function gets
> the return code of the previous operations in 'ret' but it is
> immediately overwritten and never used.
> 
> In older CRIU versions it used to be:
> 
> 	if (ret < 0)
> 		goto err;
> 
> but that is gone now. So this reintroduces the check for the int
> parameter given to cr_pre_dump_finish() by the function caller.
> 
> As the commands used to trigged the segfault do not make much sense the
> result is still not usable and the same 'Warn' and 'Error' messages are
> printed, but the segfault is gone.
> 
> V2:
>   * set the return value correctly
> 
> Signed-off-by: Adrian Reber <areber at redhat.com>
> ---
>  criu/cr-dump.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/criu/cr-dump.c b/criu/cr-dump.c
> index ec5e1e45b..fecb9d737 100644
> --- a/criu/cr-dump.c
> +++ b/criu/cr-dump.c
> @@ -1474,10 +1474,11 @@ static int setup_alarm_handler()
>  	return 0;
>  }
>  
> -static int cr_pre_dump_finish(int ret)
> +static int cr_pre_dump_finish(int status)
>  {
>  	InventoryEntry he = INVENTORY_ENTRY__INIT;
>  	struct pstree_item *item;
> +	int ret;
>  
>  	/*
>  	 * Restore registers for tasks only. The threads have not been
> @@ -1495,6 +1496,11 @@ static int cr_pre_dump_finish(int ret)
>  
>  	timing_stop(TIME_FROZEN);
>  
> +	if (status < 0) {
> +		ret = status;
> +		goto err;
> +	}
> +
>  	pr_info("Pre-dumping tasks' memory\n");
>  	for_each_pstree_item(item) {
>  		struct parasite_ctl *ctl = dmpi(item)->parasite_ctl;
> -- 
> 2.17.1
> 
> _______________________________________________
> CRIU mailing list
> CRIU at openvz.org
> https://lists.openvz.org/mailman/listinfo/criu