|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [PATCH 2/5] 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>
---
If XSM is disabled, is it really useful to issue the 2nd and 3rd calls
if the 1st yielded ENOSYS?
--- a/tools/libs/light/libxl_create.c
+++ b/tools/libs/light/libxl_create.c
@@ -1081,13 +1079,12 @@ int libxl__domain_config_setdefault(libx
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 +1093,12 @@ int libxl__domain_config_setdefault(libx
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 +1107,13 @@ int libxl__domain_config_setdefault(libx
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");
}
}
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |