mirror of
https://github.com/checkpoint-restore/criu
synced 2025-09-02 07:15:31 +00:00
compel/infect: Don't adjust stack/args alignment
Instead, fail to infect task and let compel cure it. Signed-off-by: Dmitry Safonov <dima@arista.com>
This commit is contained in:
committed by
Andrei Vagin
parent
70ecbbcc86
commit
9c0b904a02
@@ -944,7 +944,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
|
|||||||
*/
|
*/
|
||||||
if ((unsigned long)ctl->args & (4-1)) {
|
if ((unsigned long)ctl->args & (4-1)) {
|
||||||
pr_err("BUG: args are not 4 bytes aligned: %p\n", ctl->args);
|
pr_err("BUG: args are not 4 bytes aligned: %p\n", ctl->args);
|
||||||
ctl->args = (void *)round_up((unsigned long)ctl->args, 4);
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
|
memcpy(ctl->local_map, ctl->pblob.hdr.mem, ctl->pblob.hdr.bsize);
|
||||||
@@ -966,7 +966,7 @@ int compel_infect(struct parasite_ctl *ctl, unsigned long nr_threads, unsigned l
|
|||||||
*/
|
*/
|
||||||
if ((unsigned long)ctl->rstack & (16-1)) {
|
if ((unsigned long)ctl->rstack & (16-1)) {
|
||||||
pr_err("BUG: stack is not 16 bytes aligned: %p\n", ctl->rstack);
|
pr_err("BUG: stack is not 16 bytes aligned: %p\n", ctl->rstack);
|
||||||
ctl->rstack = (void *)round_down((unsigned long)ctl->rstack, 16);
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user