containers/crun
1
0
Fork 0
mirror of https://github.com/containers/crun.git synced 2026-02-05 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1983 from giuseppe/return-error-from-container-init

Browse Source 
container: do not release returned error
This commit is contained in:
Giuseppe Scrivano
2026-02-05 09:32:14 +01:00
committed by GitHub
parent ca0756f5e5 c5879bab4b
commit 33c3150ec3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libcrun/container.c
View File

@@ -1577,10 +1577,13 @@ container_init (void *args, char *notify_socket, int sync_socket, libcrun_error_
{
/* If it fails to write the error using the sync socket, then fallback
to stderr. */
if (sync_socket_write_error (sync_socket, err) < 0)
return ret;
crun_error_release (err);
if (sync_socket_write_error (sync_socket, err) == 0)
{
crun_error_release (err);
/* A return value of > 0 means to fail with an error without err being set so to avoid
printing it twice. */
return 1;
}
return ret;
}

2
src/libcrun/linux.c
View File

@@ -5268,7 +5268,7 @@ libcrun_run_linux_container (libcrun_container_t *container, container_entrypoin
if (*err)
libcrun_fail_with_error ((*err)->status, "%s", (*err)->msg);
/* If cursor is here most likely we returned from a custom handler eg. wasm, libkrun */
/* If we got here likely we returned from a custom handler eg. wasm, libkrun */
/* Allow cleanup attributes to perform cleanup and exit with success if return code was 0 */
if (ret == 0)
_safe_exit (EXIT_SUCCESS);