lib: do not set protobuf has_* field too early

For two cases libcriu was setting the RPC protobuf field `has_*` before checking if the given parameter is valid. This can lead to situations, if the caller doesn't check the return value, that we pass as RPC struct to CRIU which has the `has_*` protobuf field set to true, but does not have a verified value (or non at all) set for the actual RPC entry. Signed-off-by: Adrian Reber <[email protected]>
adrianreber · Dec 19, 2024 · ea20a5c · ea20a5c
1 parent 32d5a76
commit ea20a5c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/c/criu.c b/lib/c/criu.c
@@ -352,8 +352,8 @@ int criu_set_parent_images(const char *path)
 
 int criu_local_set_pre_dump_mode(criu_opts *opts, enum criu_pre_dump_mode mode)
 {
-	opts->rpc->has_pre_dump_mode = true;
 	if (mode == CRIU_PRE_DUMP_SPLICE || mode == CRIU_PRE_DUMP_READ) {
+		opts->rpc->has_pre_dump_mode = true;
 		opts->rpc->pre_dump_mode = (CriuPreDumpMode)mode;
 		return 0;
 	}
@@ -1867,8 +1867,8 @@ void criu_set_pidfd_store_sk(int sk)
 
 int criu_local_set_network_lock(criu_opts *opts, enum criu_network_lock_method method)
 {
-	opts->rpc->has_network_lock = true;
 	if (method == CRIU_NETWORK_LOCK_IPTABLES || method == CRIU_NETWORK_LOCK_NFTABLES || method == CRIU_NETWORK_LOCK_SKIP) {
+		opts->rpc->has_network_lock = true;
 		opts->rpc->network_lock = (CriuNetworkLockMethod)method;
 		return 0;
 	}