[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] libxl: drop dead assignments to "ret" from libxl__domain_config_setdefault()
commit 129aba0e799158c00814c0e53e9e104f8ccdb6ca Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Wed Jun 14 12:31:23 2023 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Wed Jun 14 12:31:23 2023 +0200 libxl: drop dead assignments to "ret" from libxl__domain_config_setdefault() The variable needs to be properly set only on the error paths. Coverity ID: 1532311 Fixes: ab4440112bec ("xl / libxl: push parsing of SSID and CPU pool ID down to libxl") Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Juergen Gross <jgross@xxxxxxxx> Reviewed-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxx> Acked-by: Anthony PERARD <anthony.perard@xxxxxxxxxx> --- tools/libs/light/libxl_create.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_create.c index 36770af6d4..d7e80d5df7 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -1081,13 +1081,12 @@ int libxl__domain_config_setdefault(libxl__gc *gc, ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->c_info.ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, "XSM Disabled: init_seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid init_seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, "XSM Disabled: init_seclabel not supported"); } } @@ -1096,13 +1095,12 @@ int libxl__domain_config_setdefault(libxl__gc *gc, ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->b_info.exec_ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, "XSM Disabled: seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, "XSM Disabled: seclabel not supported"); } } @@ -1111,14 +1109,13 @@ int libxl__domain_config_setdefault(libxl__gc *gc, ret = libxl_flask_context_to_sid(ctx, s, strlen(s), &d_config->b_info.device_model_ssidref); if (ret) { - if (errno == ENOSYS) { - LOGD(WARN, domid, - "XSM Disabled: device_model_stubdomain_seclabel not supported"); - ret = 0; - } else { + if (errno != ENOSYS) { LOGD(ERROR, domid, "Invalid device_model_stubdomain_seclabel: %s", s); goto error_out; } + + LOGD(WARN, domid, + "XSM Disabled: device_model_stubdomain_seclabel not supported"); } } -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |