FreeCalypso > hg > fc-magnetite
view src/aci2/aci/psa_smp.c @ 516:1ed9de6c90bd
src/g23m-gsm/sms/sms_for.c: bogus malloc removed
The new error handling code that was not present in TCS211 blob version
contains a malloc call that is bogus for 3 reasons:
1) The memory allocation in question is not needed in the first place;
2) libc malloc is used instead of one of the firmware's proper ways;
3) The memory allocation is made inside a function and then never freed,
i.e., a memory leak.
This bug was caught in gcc-built FreeCalypso fw projects (Citrine
and Selenite) because our gcc environment does not allow any use of
libc malloc (any reference to malloc produces a link failure),
but this code from TCS3.2 is wrong even for Magnetite: if this code
path is executed repeatedly over a long time, the many small allocations
made by this malloc call without a subsequent free will eventually
exhaust the malloc heap provided by the TMS470 environment, malloc will
start returning NULL, and the bogus code will treat it as an error.
Because the memory allocation in question is not needed at all,
the fix entails simply removing it.
author | Mychaela Falconia <falcon@freecalypso.org> |
---|---|
date | Sun, 22 Jul 2018 06:04:49 +0000 |
parents | 93999a60b835 |
children |
line wrap: on
line source
/* +----------------------------------------------------------------------------- | Project : | Modul : +----------------------------------------------------------------------------- | Copyright 2002 Texas Instruments Berlin, AG | All rights reserved. | | This file is confidential and a trade secret of Texas | Instruments Berlin, AG | The receipt of or possession of this file does not convey | any rights to reproduce or disclose its contents or to | manufacture, use, or sell anything it may describe, in | whole, or in part, without the specific written consent of | Texas Instruments Berlin, AG. +----------------------------------------------------------------------------- | Purpose : This module defines the processing functions for the | primitives send to the protocol stack adapter by the | session management of GPRS ( SM ). +----------------------------------------------------------------------------- */ #ifdef GPRS #ifndef PSA_SMP_C #define PSA_SMP_C #endif #include "aci_all.h" /*==== INCLUDES ===================================================*/ #include "dti.h" /* functionality of the dti library */ #include "aci_cmh.h" #include "ati_cmd.h" #include "aci_cmd.h" #include "aci.h" #include "dti_conn_mng.h" #include "dti_cntrl_mng.h" #include "gaci.h" #include "gaci_cmh.h" #include "psa.h" #include "psa_sm.h" #include "cmh.h" #include "cmh_sm.h" #if defined (FF_WAP) || defined (FF_GPF_TCPIP) || defined (FF_SAT_E) #include "psa_tcpip.h" #include "wap_aci.h" #endif /* defined (FF_WAP) || defined (FF_GPF_TCPIP) */ #ifdef FF_GPF_TCPIP #include "dcm_utils.h" #include "dcm_state.h" #include "dcm_env.h" #endif #include "dcm_f.h" /*==== CONSTANTS ==================================================*/ /*==== TYPES ======================================================*/ /*==== EXPORT =====================================================*/ /*==== VARIABLES ==================================================*/ /*==== FUNCTIONS ==================================================*/ /* +----------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : finished ROUTINE : psa_smreg_pdp_activate_cnf | +----------------------------------------------------------------------+ PURPOSE : processes the SMREG_PDP_ACTIVATE_CNF primitive send by SM. this confirms a successful context activation. */ GLOBAL const void psa_smreg_pdp_activate_cnf ( T_SMREG_PDP_ACTIVATE_CNF *smreg_pdp_activate_cnf ) { T_GPRS_CONT_CLASS *pcontext = &pdp_context[work_cids[cid_pointer] - 1]; TRACE_FUNCTION ("psa_smreg_pdp_activate_cnf()"); /* update shared parameter and notify ACI */ pdp_context->qos.preced = smreg_pdp_activate_cnf->smreg_qos.preced; pdp_context->qos.delay = smreg_pdp_activate_cnf->smreg_qos.delay; pdp_context->qos.relclass = smreg_pdp_activate_cnf->smreg_qos.relclass; pdp_context->qos.peak = smreg_pdp_activate_cnf->smreg_qos.peak; pdp_context->qos.mean = smreg_pdp_activate_cnf->smreg_qos.mean; if ( cmhSM_Activated(smreg_pdp_activate_cnf) < 0) { TRACE_EVENT("cmhSM_Activated( ) returned error."); } /* free the primitive buffer */ PFREE (smreg_pdp_activate_cnf); } /* +----------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : finished ROUTINE : psa_smreg_pdp_activate_rej | +----------------------------------------------------------------------+ PURPOSE : processes the SMREG_PDP_ACTIVATE_REJ primitive send by SM. this indicates a context activation failed. */ GLOBAL const void psa_smreg_pdp_activate_rej ( T_SMREG_PDP_ACTIVATE_REJ *smreg_pdp_activate_rej ) { TRACE_FUNCTION ("psa_smreg_pdp_activate_rej()"); /* update shared parameter and notify ACI */ smShrdPrm.pdp_rej = smreg_pdp_activate_rej; if ( cmhSM_NoActivate( ) < 0) { TRACE_EVENT("cmhSM_NoActivate( ) returned error."); } #ifdef FF_GPF_TCPIP if(is_gpf_tcpip_call()) { T_DCM_STATUS_IND_MSG msg; msg.hdr.msg_id = DCM_NEXT_CMD_STOP_MSG; dcm_send_message(msg, DCM_SUB_WAIT_CGACT_CNF); } #endif /* FF_GPF_TCPIP */ /* free the primitive buffer */ PFREE (smreg_pdp_activate_rej); } /* +----------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : developing ROUTINE : convert_apn_to_netaddr | +----------------------------------------------------------------------+ PURPOSE : converts an APN to a dotted network address */ LOCAL SHORT convert_apn_to_netaddr ( T_smreg_apn *apn_src, T_smreg_apn *apn_dest) { T_smreg_apn dummy_apn = {0}; BYTE counter1 = 0; BYTE counter2 = 0; BYTE dest_pos = 0; BYTE bytecount = 0; TRACE_FUNCTION ("convert_apn_to_netaddr()"); if(apn_src==apn_dest) { apn_dest=&dummy_apn; } while(counter1<apn_src->c_buffer-1) { bytecount=apn_src->buffer[counter1]; for(counter2=0;counter2<bytecount;counter2++) { counter1++; if (counter1>=apn_src->c_buffer) { return -1; } else { apn_dest->buffer[dest_pos]=apn_src->buffer[counter1]; dest_pos++; } } if (counter1<apn_src->c_buffer-1) { apn_dest->buffer[dest_pos]='.'; dest_pos++; counter1++; } else { apn_dest->buffer[dest_pos]=0; } } if (apn_dest == &dummy_apn) { apn_dest=apn_src; memcpy(apn_dest->buffer,&dummy_apn.buffer,dest_pos+1); apn_dest->c_buffer=dest_pos; } return 0; } /* +----------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : finished ROUTINE : psa_smreg_pdp_activate_ind | +----------------------------------------------------------------------+ PURPOSE : processes the SMREG_PDP_ACTIVATE_IND primitive send by SM. this indicates a network asked for a PDP context activation. */ GLOBAL const void psa_smreg_pdp_activate_ind ( T_SMREG_PDP_ACTIVATE_IND *smreg_pdp_activate_ind ) { TRACE_FUNCTION ("psa_smreg_pdp_activate_ind()"); /* update shared parameter and notify ACI */ memcpy(&smShrdPrm.act_ind, smreg_pdp_activate_ind, sizeof(T_SMREG_PDP_ACTIVATE_IND)); convert_apn_to_netaddr(&smShrdPrm.act_ind.smreg_apn,&smShrdPrm.act_ind.smreg_apn); cmhSM_NetActivate( ); /* free the primitive buffer */ PFREE (smreg_pdp_activate_ind); } /* +------------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : finished ROUTINE : psa_smreg_pdp_deactivate_cnf | +------------------------------------------------------------------------+ PURPOSE : processes the SMREG_PDP_DEACTIVATE_CNF primitive send by SM. this confirms a successful PDP context deactivation. */ GLOBAL const void psa_smreg_pdp_deactivate_cnf ( T_SMREG_PDP_DEACTIVATE_CNF *smreg_pdp_deactivate_cnf ) { TRACE_FUNCTION ("psa_smreg_pdp_deactivate_cnf()"); /* update shared parameter and notify ACI */ smShrdPrm.nsapi_set = smreg_pdp_deactivate_cnf->nsapi_set; cmhSM_Deactivated(); /* free the primitive buffer */ PFREE (smreg_pdp_deactivate_cnf); } /* +------------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : finished ROUTINE : psa_smreg_pdp_deactivate_ind | +------------------------------------------------------------------------+ PURPOSE : processes the SMREG_PDP_DEACTIVATE_IND primitive send by SM. this indicates a network initiated PDP context deactivation. */ GLOBAL const void psa_smreg_pdp_deactivate_ind ( T_SMREG_PDP_DEACTIVATE_IND *smreg_pdp_deactivate_ind ) { TRACE_FUNCTION ("psa_smreg_pdp_deactivate_ind()"); /* update shared parameter and notify ACI */ smShrdPrm.nsapi_set = smreg_pdp_deactivate_ind->nsapi_set; cmhSM_NetDeactivate( ); /* free the primitive buffer */ PFREE (smreg_pdp_deactivate_ind); } /* +--------------------------------------------------------------------+ | PROJECT : GPRS (8441) MODULE : PSA_SM | | STATE : finished ROUTINE : psa_smreg_pdp_modify_ind | +--------------------------------------------------------------------+ PURPOSE : processes the SMREG_PDP_MODIFY_IND primitive send by SM. this indicates a network initiated PDP context modification. */ GLOBAL const void psa_smreg_pdp_modify_ind ( T_SMREG_PDP_MODIFY_IND *smreg_pdp_modify_ind ) { TRACE_FUNCTION ("psa_smreg_pdp_modify_ind()"); /* *------------------------------------------------------------------- * informs context manager *------------------------------------------------------------------- */ cmhSM_NetModify( smreg_pdp_modify_ind->nsapi_set, &smreg_pdp_modify_ind->smreg_qos ); /* *------------------------------------------------------------------- * free the primitive buffer *------------------------------------------------------------------- */ PFREE (smreg_pdp_modify_ind); } #endif /* GPRS */ /*==== EOF =========================================================*/