Hi zoran,
Reviewed the patch.
Hi zoran,

Reviewed the patch.
Ack.

/Neel.


On Friday 10 April 2015 05:49 PM, Zoran Milinkovic wrote:
>   osaf/libs/agents/saf/imma/imma_om_api.c |  42 
> ++++++++++++++++++++++++++++++--
>   1 files changed, 39 insertions(+), 3 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_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
> @@ -2087,6 +2087,12 @@ SaAisErrorT saImmOmCcbObjectModify_2(SaI
>               return SA_AIS_ERR_INVALID_PARAM;
>       }
>   
> +     if(!osaf_is_extended_name_valid(objectName)) {
> +             TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
> +             TRACE_LEAVE();
> +             return SA_AIS_ERR_INVALID_PARAM;
> +     }
> +
>       if (osaf_is_extended_name_empty(objectName)) {
>               TRACE_2("ERR_INVALID_PARAM: objectName is empty");
>               TRACE_LEAVE();
> @@ -2543,6 +2549,12 @@ SaAisErrorT saImmOmCcbObjectDelete(SaImm
>               return SA_AIS_ERR_INVALID_PARAM;
>       }
>   
> +     if(!osaf_is_extended_name_valid(objectName)) {
> +             TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
> +             TRACE_LEAVE();
> +             return SA_AIS_ERR_INVALID_PARAM;
> +     }
> +
>       if (cb->is_immnd_up == false) {
>               TRACE_3("ERR_TRY_AGAIN: IMMND is DOWN");
>               /* ##1## Any on going ccb has been aborted and this will be 
> detected
> @@ -7081,6 +7093,7 @@ SaAisErrorT saImmOmAdminOwnerSet(SaImmAd
>       SaImmHandleT immHandle=0LL;
>       SaUint32T adminOwnerId = 0;
>       SaUint32T timeout = 0;
> +     int i;
>       TRACE_ENTER();
>   
>       if (cb->sv_id == 0) {
> @@ -7089,9 +7102,17 @@ SaAisErrorT saImmOmAdminOwnerSet(SaImmAd
>       }
>   
>       if (!objectNames || (objectNames[0] == 0)) {
> +             TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
>               return SA_AIS_ERR_INVALID_PARAM;
>       }
>   
> +     for (i = 0; objectNames[i]; ++i) {
> +             if(!osaf_is_extended_name_valid(objectNames[i])) {
> +                     TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
> +                     return SA_AIS_ERR_INVALID_PARAM;
> +             }
> +     }
> +
>       switch (scope) {
>               case SA_IMM_ONE:
>               case SA_IMM_SUBLEVEL:
> @@ -7209,7 +7230,6 @@ SaAisErrorT saImmOmAdminOwnerSet(SaImmAd
>       admo_set_evt.info.immnd.info.admReq.adm_owner_id = adminOwnerId;
>       admo_set_evt.info.immnd.info.admReq.scope = scope;
>   
> -     int i;
>       for (i = 0; objectNames[i]; ++i) {
>               objectName = objectNames[i];
>               IMMSV_OBJ_NAME_LIST *ol = calloc(1, 
> sizeof(IMMSV_OBJ_NAME_LIST));       /*a */
> @@ -7287,6 +7307,7 @@ SaAisErrorT saImmOmAdminOwnerRelease(SaI
>       SaImmHandleT immHandle=0LL;
>       SaUint32T adminOwnerId = 0;
>       SaUint32T timeout = 0;
> +     int i;
>       TRACE_ENTER();
>   
>       if (cb->sv_id == 0) {
> @@ -7295,9 +7316,17 @@ SaAisErrorT saImmOmAdminOwnerRelease(SaI
>       }
>   
>       if (!objectNames || (objectNames[0] == 0)) {
> +             TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
>               return SA_AIS_ERR_INVALID_PARAM;
>       }
>   
> +     for (i = 0; objectNames[i]; ++i) {
> +             if(!osaf_is_extended_name_valid(objectNames[i])) {
> +                     TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
> +                     return SA_AIS_ERR_INVALID_PARAM;
> +             }
> +     }
> +
>       switch (scope) {
>               case SA_IMM_ONE:
>               case SA_IMM_SUBLEVEL:
> @@ -7402,7 +7431,6 @@ SaAisErrorT saImmOmAdminOwnerRelease(SaI
>       admo_set_evt.info.immnd.info.admReq.adm_owner_id = adminOwnerId;
>       admo_set_evt.info.immnd.info.admReq.scope = scope;
>   
> -     int i;
>       for (i = 0; objectNames[i]; ++i) {
>               objectName = objectNames[i];
>               IMMSV_OBJ_NAME_LIST *ol = calloc(1, 
> sizeof(IMMSV_OBJ_NAME_LIST));       /*a */
> @@ -7483,6 +7511,7 @@ SaAisErrorT saImmOmAdminOwnerClear(SaImm
>       const SaNameT *objectName;
>       bool locked = true;
>       SaUint32T timeout = 0;
> +     int i;
>       TRACE_ENTER();
>   
>       if (cb->sv_id == 0) {
> @@ -7491,9 +7520,17 @@ SaAisErrorT saImmOmAdminOwnerClear(SaImm
>       }
>   
>       if (!objectNames || (objectNames[0] == 0)) {
> +             TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
>               return SA_AIS_ERR_INVALID_PARAM;
>       }
>   
> +     for (i = 0; objectNames[i]; ++i) {
> +             if(!osaf_is_extended_name_valid(objectNames[i])) {
> +                     TRACE_2("ERR_INVALID_PARAM: Object name is invalid");
> +                     return SA_AIS_ERR_INVALID_PARAM;
> +             }
> +     }
> +
>       switch (scope) {
>               case SA_IMM_ONE:
>               case SA_IMM_SUBLEVEL:
> @@ -7560,7 +7597,6 @@ SaAisErrorT saImmOmAdminOwnerClear(SaImm
>       admo_set_evt.info.immnd.info.admReq.adm_owner_id = 0;
>       admo_set_evt.info.immnd.info.admReq.scope = scope;
>   
> -     int i;
>       for (i = 0; objectNames[i]; ++i) {
>               objectName = objectNames[i];
>               IMMSV_OBJ_NAME_LIST *ol = calloc(1, 
> sizeof(IMMSV_OBJ_NAME_LIST));       /*a */


------------------------------------------------------------------------------
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