[PATCH 0 of 4] #2 Add reference validation to VSMigrationService and VSMigrateCap.
More reference validation updates. This patch set is dependent on the get_vsm_cap() reference validation set. See commit logs for updates from set 1 to set 2: -Add reference validation to get_migration_service() - Add support for ref checking to VSMigrationCapabilities
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1203463635 28800 # Node ID 0d38670abc3cd4be2560daddbd038ebce630f3fb # Parent 95c56a7a865df18bbdf1066d8b04d5d4b75e7d44 Add reference validation to get_migration_service(). Adds reference validation to VirtualSystemMigrationService. Updates: -Initialize inst to NULL in return_vsms() to prevent seg fault -Use pfx_from_conn() in get_migration_service() instead of CLASSNAME(ref) Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 95c56a7a865d -r 0d38670abc3c src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Feb 19 08:39:04 2008 -0800 +++ b/src/Virt_VSMigrationService.c Tue Feb 19 15:27:15 2008 -0800 @@ -755,15 +755,26 @@ STDIM_MethodMIStub(, Virt_VSMigrationSer CMPIStatus get_migration_service(const CMPIObjectPath *ref, CMPIInstance **_inst, - const CMPIBroker *broker) + const CMPIBroker *broker, + bool is_get_inst) { CMPIInstance *inst; CMPIStatus s = {CMPI_RC_OK, NULL}; + virConnectPtr conn = NULL; const char *name = NULL; const char *ccname = NULL; + conn = connect_by_classname(broker, CLASSNAME(ref), &s); + if (conn == NULL) { + if (is_get_inst) + cu_statusf(broker, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance"); + goto out; + } + inst = get_typed_instance(broker, - CLASSNAME(ref), + pfx_from_conn(conn), "VirtualSystemMigrationService", NAMESPACE(ref)); if (inst == NULL) { @@ -793,6 +804,12 @@ CMPIStatus get_migration_service(const C CMSetProperty(inst, "SystemCreationClassName", (CMPIValue *)ccname, CMPI_chars); + if (is_get_inst) { + s = cu_validate_ref(broker, ref, inst); + if (s.rc != CMPI_RC_OK) + goto out; + } + cu_statusf(broker, &s, CMPI_RC_OK, ""); @@ -800,24 +817,28 @@ CMPIStatus get_migration_service(const C *_inst = inst; out: + virConnectClose(conn); + return s; } static CMPIStatus return_vsms(const CMPIObjectPath *ref, const CMPIResult *results, - bool name_only) -{ - CMPIInstance *inst; - CMPIStatus s; - - s = get_migration_service(ref, &inst, _BROKER); - if (s.rc == CMPI_RC_OK) { - if (name_only) - cu_return_instance_name(results, inst); - else - CMReturnInstance(results, inst); - } - + bool name_only, + bool is_get_inst) +{ + CMPIInstance *inst = NULL; + CMPIStatus s; + + s = get_migration_service(ref, &inst, _BROKER, is_get_inst); + if ((s.rc != CMPI_RC_OK) || (inst == NULL)) + goto out; + + if (name_only) + cu_return_instance_name(results, inst); + else + CMReturnInstance(results, inst); + out: return s; } @@ -826,7 +847,7 @@ static CMPIStatus EnumInstanceNames(CMPI const CMPIResult *results, const CMPIObjectPath *ref) { - return return_vsms(ref, results, true); + return return_vsms(ref, results, true, false, false); } static CMPIStatus EnumInstances(CMPIInstanceMI *self, @@ -836,7 +857,7 @@ static CMPIStatus EnumInstances(CMPIInst const char **properties) { - return return_vsms(ref, results, false); + return return_vsms(ref, results, false, false, false); } @@ -846,24 +867,7 @@ static CMPIStatus GetInstance(CMPIInstan const CMPIObjectPath *ref, const char **properties) { - CMPIInstance *inst; - CMPIStatus s; - const char *prop; - - s = get_migration_service(ref, &inst, _BROKER); - if (s.rc != CMPI_RC_OK) - return s; - - prop = cu_compare_ref(ref, inst); - if (prop != NULL) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_NOT_FOUND, - "No such instance (%s)", prop); - } else { - CMReturnInstance(results, inst); - } - - return s; + return return_vsms(ref, results, false, true, true); } DEFAULT_CI(); diff -r 95c56a7a865d -r 0d38670abc3c src/Virt_VSMigrationService.h --- a/src/Virt_VSMigrationService.h Tue Feb 19 08:39:04 2008 -0800 +++ b/src/Virt_VSMigrationService.h Tue Feb 19 15:27:15 2008 -0800 @@ -21,7 +21,8 @@ CMPIStatus get_migration_service(const CMPIObjectPath *reference, CMPIInstance **_inst, - const CMPIBroker *broker); + const CMPIBroker *broker, + bool is_get_inst); /* * Local Variables:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1203463638 28800 # Node ID 839b8d433ef5157fc34f5bb7f003e9cb8ed700c7 # Parent 0d38670abc3cd4be2560daddbd038ebce630f3fb Update calls to get_migration_service() to use new param. This param indicates whether the reference should be validated, or if an instance (without ref validation) should be returned. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 0d38670abc3c -r 839b8d433ef5 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Tue Feb 19 15:27:15 2008 -0800 +++ b/src/Virt_ElementCapabilities.c Tue Feb 19 15:27:18 2008 -0800 @@ -70,12 +70,16 @@ static CMPIStatus validate_caps_get_serv if ((s.rc != CMPI_RC_OK) || (_inst == NULL)) goto out; - s = get_migration_service(ref, &_inst, _BROKER); + s = get_migration_service(ref, &_inst, _BROKER, false); } else cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, "Not found"); + + if ((s.rc != CMPI_RC_OK) || (_inst == NULL)) + goto out; + *inst = _inst; out: free(classname); @@ -99,7 +103,7 @@ static CMPIStatus validate_service_get_c s = get_vsm_cap(_BROKER, ref, &_inst, false); } else if (STREQC(classname, "VirtualSystemMigrationService")) { - s = get_migration_service(ref, &_inst, _BROKER); + s = get_migration_service(ref, &_inst, _BROKER, true); if ((s.rc != CMPI_RC_OK) || (_inst == NULL)) goto out; diff -r 0d38670abc3c -r 839b8d433ef5 src/Virt_HostedService.c --- a/src/Virt_HostedService.c Tue Feb 19 15:27:15 2008 -0800 +++ b/src/Virt_HostedService.c Tue Feb 19 15:27:18 2008 -0800 @@ -51,7 +51,7 @@ static CMPIStatus validate_service_ref(c } else if (STREQC(classname, "ResourcePoolConfigurationService")) { s = get_rpcs(ref, &inst, _BROKER, true); } else if (STREQC(classname, "VirtualSystemMigrationService")) { - s = get_migration_service(ref, &inst, _BROKER); + s = get_migration_service(ref, &inst, _BROKER, true); } if (s.rc != CMPI_RC_OK) @@ -117,7 +117,7 @@ static CMPIStatus host_to_service(const if (!CMIsNullObject(inst)) inst_list_add(list, inst); - s = get_migration_service(ref, &inst, _BROKER); + s = get_migration_service(ref, &inst, _BROKER, false); if (s.rc != CMPI_RC_OK) return s; if (!CMIsNullObject(inst)) diff -r 0d38670abc3c -r 839b8d433ef5 src/Virt_VSMigrationService.c --- a/src/Virt_VSMigrationService.c Tue Feb 19 15:27:15 2008 -0800 +++ b/src/Virt_VSMigrationService.c Tue Feb 19 15:27:18 2008 -0800 @@ -847,7 +847,7 @@ static CMPIStatus EnumInstanceNames(CMPI const CMPIResult *results, const CMPIObjectPath *ref) { - return return_vsms(ref, results, true, false, false); + return return_vsms(ref, results, true, false); } static CMPIStatus EnumInstances(CMPIInstanceMI *self, @@ -857,7 +857,7 @@ static CMPIStatus EnumInstances(CMPIInst const char **properties) { - return return_vsms(ref, results, false, false, false); + return return_vsms(ref, results, false, false); } @@ -867,7 +867,7 @@ static CMPIStatus GetInstance(CMPIInstan const CMPIObjectPath *ref, const char **properties) { - return return_vsms(ref, results, false, true, true); + return return_vsms(ref, results, false, true); } DEFAULT_CI();
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1203463791 28800 # Node ID b59709a9c0ae71d78399327d411e703b19080177 # Parent 839b8d433ef5157fc34f5bb7f003e9cb8ed700c7 Add support for ref checking to VSMigrationCapabilities. Updates: -Initialize inst to NULL in return_vsmc() to prevent seg fault -Use pfx_from_conn() in get_migration_caps() instead of CLASSNAME(ref) -Initialize CMPIStatus s in get_migration_caps() Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r 839b8d433ef5 -r b59709a9c0ae src/Virt_VSMigrationCapabilities.c --- a/src/Virt_VSMigrationCapabilities.c Tue Feb 19 15:27:18 2008 -0800 +++ b/src/Virt_VSMigrationCapabilities.c Tue Feb 19 15:29:51 2008 -0800 @@ -81,13 +81,24 @@ static CMPIStatus set_method_properties( CMPIStatus get_migration_caps(const CMPIObjectPath *ref, CMPIInstance **_inst, - const CMPIBroker *broker) + const CMPIBroker *broker, + bool is_get_inst) { CMPIInstance *inst; - CMPIStatus s; + CMPIStatus s = {CMPI_RC_OK, NULL}; + virConnectPtr conn = NULL; + + conn = connect_by_classname(broker, CLASSNAME(ref), &s); + if (conn == NULL) { + if (is_get_inst) + cu_statusf(broker, &s, + CMPI_RC_ERR_NOT_FOUND, + "No such instance"); + goto out; + } inst = get_typed_instance(broker, - CLASSNAME(ref), + pfx_from_conn(conn), "VirtualSystemMigrationCapabilities", NAMESPACE(ref)); if (inst == NULL) { @@ -102,28 +113,42 @@ CMPIStatus get_migration_caps(const CMPI s = set_method_properties(broker, inst); - if (s.rc == CMPI_RC_OK) - *_inst = inst; + if (s.rc != CMPI_RC_OK) + goto out; + + if (is_get_inst) { + s = cu_validate_ref(broker, ref, inst); + if (s.rc != CMPI_RC_OK) + goto out; + } + + *_inst = inst; + + out: + + virConnectClose(conn); return s; } static CMPIStatus return_vsmc(const CMPIObjectPath *ref, const CMPIResult *results, - bool name_only) -{ - CMPIInstance *inst; + bool name_only, + bool is_get_inst) +{ + CMPIInstance *inst = NULL; CMPIStatus s; - s = get_migration_caps(ref, &inst, _BROKER); - - if (s.rc == CMPI_RC_OK) { - if (name_only) - cu_return_instance_name(results, inst); - else - CMReturnInstance(results, inst); - } - + s = get_migration_caps(ref, &inst, _BROKER, is_get_inst); + if ((s.rc != CMPI_RC_OK) || (inst == NULL)) + goto out; + + if (name_only) + cu_return_instance_name(results, inst); + else + CMReturnInstance(results, inst); + + out: return s; } @@ -132,7 +157,7 @@ static CMPIStatus EnumInstanceNames(CMPI const CMPIResult *results, const CMPIObjectPath *ref) { - return return_vsmc(ref, results, true); + return return_vsmc(ref, results, true, false); } static CMPIStatus EnumInstances(CMPIInstanceMI *self, @@ -142,7 +167,7 @@ static CMPIStatus EnumInstances(CMPIInst const char **properties) { - return return_vsmc(ref, results, false); + return return_vsmc(ref, results, false, false); } @@ -152,24 +177,7 @@ static CMPIStatus GetInstance(CMPIInstan const CMPIObjectPath *ref, const char **properties) { - CMPIInstance *inst; - CMPIStatus s; - const char *prop; - - s = get_migration_caps(ref, &inst, _BROKER); - if (s.rc != CMPI_RC_OK) - return s; - - prop = cu_compare_ref(ref, inst); - if (prop != NULL) { - cu_statusf(_BROKER, &s, - CMPI_RC_ERR_NOT_FOUND, - "No such instance (%s)", prop); - } else { - CMReturnInstance(results, inst); - } - - return s; + return return_vsmc(ref, results, false, true); } DEFAULT_CI(); diff -r 839b8d433ef5 -r b59709a9c0ae src/Virt_VSMigrationCapabilities.h --- a/src/Virt_VSMigrationCapabilities.h Tue Feb 19 15:27:18 2008 -0800 +++ b/src/Virt_VSMigrationCapabilities.h Tue Feb 19 15:29:51 2008 -0800 @@ -21,7 +21,8 @@ CMPIStatus get_migration_caps(const CMPIObjectPath *reference, CMPIInstance **_inst, - const CMPIBroker *broker); + const CMPIBroker *broker, + bool is_get_inst); /* * Local Variables:
# HG changeset patch # User Kaitlin Rupert <karupert@us.ibm.com> # Date 1203463792 28800 # Node ID f932effa29a1878a03a0441e2792184e46caa018 # Parent b59709a9c0ae71d78399327d411e703b19080177 Update the get_migration_caps() calls to include new param. This extra param indicates that the reference need to be validated. Signed-off-by: Kaitlin Rupert <karupert@us.ibm.com> diff -r b59709a9c0ae -r f932effa29a1 src/Virt_ElementCapabilities.c --- a/src/Virt_ElementCapabilities.c Tue Feb 19 15:29:51 2008 -0800 +++ b/src/Virt_ElementCapabilities.c Tue Feb 19 15:29:52 2008 -0800 @@ -66,7 +66,7 @@ static CMPIStatus validate_caps_get_serv s = get_vsms(ref, &_inst, _BROKER, false); } else if (STREQC(classname, "VirtualSystemMigrationCapabilities")) { - s = get_migration_caps(ref, &_inst, _BROKER); + s = get_migration_caps(ref, &_inst, _BROKER, true); if ((s.rc != CMPI_RC_OK) || (_inst == NULL)) goto out; @@ -107,7 +107,7 @@ static CMPIStatus validate_service_get_c if ((s.rc != CMPI_RC_OK) || (_inst == NULL)) goto out; - s = get_migration_caps(ref, &_inst, _BROKER); + s = get_migration_caps(ref, &_inst, _BROKER, false); } else cu_statusf(_BROKER, &s, CMPI_RC_ERR_NOT_FOUND, @@ -139,7 +139,7 @@ static CMPIStatus sys_to_cap(const CMPIO if (s.rc == CMPI_RC_OK) inst_list_add(list, inst); - s = get_migration_caps(ref, &inst, _BROKER); + s = get_migration_caps(ref, &inst, _BROKER, false); if (s.rc == CMPI_RC_OK) inst_list_add(list, inst);
Kaitlin Rupert wrote:
More reference validation updates.
This patch set is dependent on the get_vsm_cap() reference validation set.
See commit logs for updates from set 1 to set 2: -Add reference validation to get_migration_service() - Add support for ref checking to VSMigrationCapabilities
_______________________________________________ Libvirt-cim mailing list Libvirt-cim@redhat.com https://www.redhat.com/mailman/listinfo/libvirt-cim
That's an excellent patch set ... +1 :) ! -- Regards Heidi Eckhart Software Engineer IBM Linux Technology Center - Open Hypervisor
participants (2)
-
Heidi Eckhart -
Kaitlin Rupert