Ack from me.
Tested with immomtest and immoitest

/AndersBj

-----Original Message-----
From: Zoran Milinkovic [mailto:[email protected]] 
Sent: den 10 april 2015 14:22
To: [email protected]
Cc: [email protected]
Subject: [devel] [PATCH 1 of 1] imm: validate SaNameT value before 
osaf_extended_name_length [#1303]

 osaf/libs/agents/saf/imma/imma_oi_api.c |  20 ++++++++++  
osaf/libs/agents/saf/imma/imma_om_api.c |  64 +++++++++++++++++++++++++++++++-
 2 files changed, 82 insertions(+), 2 deletions(-)


The patch fix validation of SaNameT value before osaf_extended_name_length to 
avoid assertion for SaNameT values longer than 255 bytes when the support for 
extended names is not enabled.

diff --git a/osaf/libs/agents/saf/imma/imma_oi_api.c 
b/osaf/libs/agents/saf/imma/imma_oi_api.c
--- a/osaf/libs/agents/saf/imma/imma_oi_api.c
+++ b/osaf/libs/agents/saf/imma/imma_oi_api.c
@@ -1960,6 +1960,11 @@ SaAisErrorT saImmOiObjectImplementerSet(
        char objName[SA_MAX_UNEXTENDED_NAME_LENGTH];
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = objName;
@@ -2176,6 +2181,11 @@ SaAisErrorT saImmOiObjectImplementerRele
        char objName[SA_MAX_UNEXTENDED_NAME_LENGTH];
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = objName;
@@ -2376,6 +2386,11 @@ SaAisErrorT saImmOiRtObjectUpdate_2(SaIm
        char objName[SA_MAX_UNEXTENDED_NAME_LENGTH];
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = objName;
@@ -3045,6 +3060,11 @@ SaAisErrorT saImmOiRtObjectDelete(SaImmO
        char objName[SA_MAX_UNEXTENDED_NAME_LENGTH];
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = objName;
diff --git a/osaf/libs/agents/saf/imma/imma_om_api.c 
b/osaf/libs/agents/saf/imma/imma_om_api.c
--- a/osaf/libs/agents/saf/imma/imma_om_api.c
+++ b/osaf/libs/agents/saf/imma/imma_om_api.c
@@ -1830,13 +1830,17 @@ static SaAisErrorT ccb_object_create_com
        strncpy(evt.info.immnd.info.objCreate.className.buf, className, 
evt.info.immnd.info.objCreate.className.size);
 
        size_t parentNameLength = 0;
-       if (parentName && (parentNameLength = 
osaf_extended_name_length(parentName)) > 0) {
-               if(!osaf_is_extended_names_enabled() && parentNameLength >= 
SA_MAX_UNEXTENDED_NAME_LENGTH) {
+       if(parentName) {
+               if(!osaf_is_extended_name_valid(parentName)) {
                        rc = SA_AIS_ERR_INVALID_PARAM;
                        TRACE_2("ERR_INVALID_PARAM: Parent name invalid");
                        goto mds_send_fail;
                }
 
+               parentNameLength = osaf_extended_name_length(parentName);
+       }
+
+       if (parentNameLength > 0) {
                evt.info.immnd.info.objCreate.parentOrObjectDn.size = 
parentNameLength + 1;
                evt.info.immnd.info.objCreate.parentOrObjectDn.buf = (char*) 
malloc((parentNameLength + 1) * sizeof(char));
                if (!evt.info.immnd.info.objCreate.parentOrObjectDn.buf) { @@ 
-2130,6 +2134,11 @@ SaAisErrorT saImmOmCcbObjectModify_2(SaI
        SaAisErrorT rc;
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = (SaStringT)malloc(len + 1); @@ -2619,6 
+2628,11 @@ SaAisErrorT saImmOmCcbObjectDelete(SaImm
        SaAisErrorT rc;
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = (SaStringT)malloc(len + 1); @@ -3541,6 
+3555,11 @@ SaAisErrorT saImmOmAdminOperationInvoke_
        SaAisErrorT rc;
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = (SaStringT)malloc(len + 1); @@ -3577,6 
+3596,11 @@ SaAisErrorT saImmOmAdminOperationInvoke_
        SaAisErrorT rc;
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = (SaStringT)malloc(len + 1); @@ -4135,6 
+4159,11 @@ SaAisErrorT saImmOmAdminOperationInvokeA
        SaAisErrorT rc;
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = (SaStringT)malloc(len + 1); @@ -5641,6 
+5670,11 @@ SaAisErrorT saImmOmAccessorGet_2(SaImmAc
        SaAisErrorT rc;
 
        if(objectName) {
+               if(!osaf_is_extended_name_valid(objectName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(objectName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        objectNameStr = (SaStringT)malloc(len + 1); @@ -6489,6 
+6523,11 @@ SaAisErrorT saImmOmSearchInitialize_2(Sa
        SaAisErrorT rc;
 
        if(rootName) {
+               if(!osaf_is_extended_name_valid(rootName)) {
+                       TRACE_2("ERR_INVALID_PARAM: Root name is invalid");
+                       return SA_AIS_ERR_INVALID_PARAM;
+               }
+
                size_t len = osaf_extended_name_length(rootName);
                if(len < SA_MAX_UNEXTENDED_NAME_LENGTH) {
                        rootNameStr = (SaStringT)malloc(len + 1); @@ -7502,6 
+7541,12 @@ SaAisErrorT saImmOmAdminOwnerSet(SaImmAd
                objectNamesStr = (SaStringT *)calloc(1, sizeof(SaStringT) * 
(arrSize + 1));
 
                for(i=0; i<arrSize; i++) {
+                       if(!osaf_is_extended_name_valid(objectNames[i])) {
+                               TRACE_2("ERR_INVALID_PARAM: Object name is 
invalid");
+                               rc = SA_AIS_ERR_INVALID_PARAM;
+                               goto failed;
+                       }
+
                        objectNamesStr[i] = 
strndup(osaf_extended_name_borrow(objectNames[i]),
                                        
osaf_extended_name_length(objectNames[i]));
                }
@@ -7509,6 +7554,7 @@ SaAisErrorT saImmOmAdminOwnerSet(SaImmAd
 
        rc = admin_owner_set_common(adminOwnerHandle, (SaConstStringT 
*)objectNamesStr, scope, false);
 
+failed:
        /* Free allocated memory */
        if(objectNamesStr) {
                for(i=0; objectNamesStr[i]; i++) {
@@ -7748,6 +7794,12 @@ SaAisErrorT saImmOmAdminOwnerRelease(SaI
                objectNamesStr = (SaStringT *)calloc(1, sizeof(SaStringT) * 
(arrSize + 1));
 
                for(i=0; i<arrSize; i++) {
+                       if(!osaf_is_extended_name_valid(objectNames[i])) {
+                               TRACE_2("ERR_INVALID_PARAM: Object name is 
invalid");
+                               rc = SA_AIS_ERR_INVALID_PARAM;
+                               goto failed;
+                       }
+
                        objectNamesStr[i] = 
strndup(osaf_extended_name_borrow(objectNames[i]),
                                        
osaf_extended_name_length(objectNames[i]));
                }
@@ -7755,6 +7807,7 @@ SaAisErrorT saImmOmAdminOwnerRelease(SaI
 
        rc = admin_owner_release_common(adminOwnerHandle, (SaConstStringT 
*)objectNamesStr, scope, false);
 
+failed:
        /* Free allocated memory */
        if(objectNamesStr) {
                for(i=0; objectNamesStr[i]; i++) {
@@ -7991,6 +8044,12 @@ SaAisErrorT saImmOmAdminOwnerClear(SaImm
                objectNamesStr = (SaStringT *)calloc(1, sizeof(SaStringT) * 
(arrSize + 1));
 
                for(i=0; i<arrSize; i++) {
+                       if(!osaf_is_extended_name_valid(objectNames[i])) {
+                               TRACE_2("ERR_INVALID_PARAM: Object name is 
invalid");
+                               rc = SA_AIS_ERR_INVALID_PARAM;
+                               goto failed;
+                       }
+
                        len = osaf_extended_name_length(objectNames[i]);
                        objectNamesStr[i] = (SaStringT)malloc(len + 1);
                        memcpy(objectNamesStr[i], 
osaf_extended_name_borrow(objectNames[i]), len); @@ -8000,6 +8059,7 @@ 
SaAisErrorT saImmOmAdminOwnerClear(SaImm
 
        rc = admin_owner_clear_common(immHandle, (SaConstStringT 
*)objectNamesStr, scope, false);
 
+failed:
        /* Free allocated memory */
        if(objectNamesStr) {
                for(i=0; objectNamesStr[i]; i++) {

------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT Develop your own 
process in accordance with the BPMN 2 standard Learn Process modeling best 
practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_ 
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

------------------------------------------------------------------------------
BPM Camp - Free Virtual Workshop May 6th at 10am PDT/1PM EDT
Develop your own process in accordance with the BPMN 2 standard
Learn Process modeling best practices with Bonita BPM through live exercises
http://www.bonitasoft.com/be-part-of-it/events/bpm-camp-virtual- event?utm_
source=Sourceforge_BPM_Camp_5_6_15&utm_medium=email&utm_campaign=VA_SF
_______________________________________________
Opensaf-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/opensaf-devel

Reply via email to