proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-17 22:05:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c/r: zero a smaller than known migrate_opts struct

Browse Source 
Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
This commit is contained in:
Tycho Andersen 2016-09-08 09:14:42 -06:00
parent d32bcb1722
commit 2cb80427bc
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lxc/lxccontainer.c
View File

@ -3960,6 +3960,7 @@ static int do_lxcapi_migrate(struct lxc_container *c, unsigned int cmd,
struct migrate_opts *opts, unsigned int size) struct migrate_opts *opts, unsigned int size)
{ {
int ret; int ret;
struct migrate_opts *valid_opts = opts;
/* If the caller has a bigger (newer) struct migrate_opts, let's make /* If the caller has a bigger (newer) struct migrate_opts, let's make
* sure that the stuff on the end is zero, i.e. that they didn't ask us * sure that the stuff on the end is zero, i.e. that they didn't ask us
@ -3978,15 +3979,28 @@ static int do_lxcapi_migrate(struct lxc_container *c, unsigned int cmd,
} }
} }
/* If the caller has a smaller struct, let's zero out the end for them
* so we don't accidentally use bits of it that they didn't know about
* to initialize.
*/
if (size < sizeof(*opts)) {
valid_opts = malloc(sizeof(*opts));
if (!valid_opts)
return -ENOMEM;
memset(valid_opts, 0, sizeof(*opts));
memcpy(valid_opts, opts, size);
}
switch (cmd) { switch (cmd) {
case MIGRATE_PRE_DUMP: case MIGRATE_PRE_DUMP:
ret = !__criu_pre_dump(c, opts); ret = !__criu_pre_dump(c, valid_opts);
break; break;
case MIGRATE_DUMP: case MIGRATE_DUMP:
ret = !__criu_dump(c, opts); ret = !__criu_dump(c, valid_opts);
break; break;
case MIGRATE_RESTORE: case MIGRATE_RESTORE:
ret = !__criu_restore(c, opts); ret = !__criu_restore(c, valid_opts);
break; break;
default: default:
ERROR("invalid migrate command %u", cmd); ERROR("invalid migrate command %u", cmd);