From 9bd9d3d205199e1aafdf78caddadb1de413df7e7 Mon Sep 17 00:00:00 2001 From: Dean Sanner Date: Fri, 28 Jun 2013 09:44:49 -0500 Subject: Fix mailbox memory allocation error on attribute sync Change-Id: If156faa95769b70731dc77f7b9801ff3ea743556 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5239 Reviewed-by: Dean Sanner Tested-by: Jenkins Server Reviewed-by: A. Patrick Williams III --- src/usr/targeting/attrsync.C | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/usr/targeting') diff --git a/src/usr/targeting/attrsync.C b/src/usr/targeting/attrsync.C index ca70f8658..70494a691 100644 --- a/src/usr/targeting/attrsync.C +++ b/src/usr/targeting/attrsync.C @@ -180,7 +180,7 @@ namespace TARGETING if ( ATTR_SYNC_SECTION_TO_HB == l_pMsg->type ) { TARG_DBG( "HB Attribute Sync Section message type received " - "from the FSP"); + "from the FSP"); // get the section id l_page.sectionId = ATTR_SYNC_GET_SECTION_ID(l_pMsg->data[0]); @@ -231,11 +231,15 @@ namespace TARGETING { iv_pages.push_back(l_page); } + + // Free memory allocated for message + msg_free( l_pMsg ); + l_pMsg = NULL; } else if ( ATTR_SYNC_COMPLETE_TO_HB == l_pMsg->type ) { TARG_DBG( "HB Attribute Sync Complete message type " - "received from the FSP"); + "received from the FSP"); l_sync_complete = true; @@ -299,11 +303,6 @@ namespace TARGETING { TARG_ERR( "WARNING: Invalid message type [0x%x] received " "from the FSP, ignoring...", l_pMsg->type); - } - - // Free memory allocated for message - if ( msg_is_async(l_pMsg) ) - { msg_free( l_pMsg ); l_pMsg = NULL; } @@ -477,7 +476,7 @@ namespace TARGETING free( i_msg->extra_data ); } } - + return l_errl; } @@ -514,7 +513,7 @@ namespace TARGETING if( l_errl ) { TRACFCOMP(g_trac_targeting, - "Error returned when syncing section type %d to FSP", + "Error returned when syncing section type %d to FSP", section_type[i]); break; } @@ -547,7 +546,7 @@ namespace TARGETING if (l_errl) { TARG_ERR( "Error registering the Hostboot message queue with " - "mailbox service." ); + "mailbox service." ); break; } -- cgit v1.2.1