diff mbox

[19/27] Fix crash in ucast cache when ucast cache invalidates after updating one of the switches

Message ID 1343750695-28063-19-git-send-email-alexne@mellanox.com (mailing list archive)
State Accepted
Delegated to: Alex Netes
Headers show

Commit Message

Alex Netes July 31, 2012, 4:04 p.m. UTC 
Signed-off-by: Alex Netes <alexne@mellanox.com>
Signed-off-by: Hal Rosenstock <hal@mellanox.com>
Signed-off-by: Vladimir Koushnir <vladimirk@mellanox.com>
--
Changes since v2:
	Sets p_sw->lft_size = 0 in osm_ucast_cache_add_node()

Changes since v1:
	Sets p_sw->lft_size only after successful malloc()
---
 opensm/osm_ucast_cache.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
diff mbox

Patch

diff --git a/opensm/osm_ucast_cache.c b/opensm/osm_ucast_cache.c
index 701b8a8..fc28be7 100644
--- a/opensm/osm_ucast_cache.c
+++ b/opensm/osm_ucast_cache.c
@@ -318,8 +318,6 @@  cache_restore_ucast_info(osm_ucast_mgr_t * p_mgr,
 		free(p_sw->new_lft);
 	p_sw->new_lft = p_cache_sw->lft;
 	p_cache_sw->lft = NULL;
-	p_sw->lft_size = (p_sw->max_lid_ho / IB_SMP_DATA_SIZE + 1)
-			 * IB_SMP_DATA_SIZE;
 
 	p_sw->num_hops = p_cache_sw->num_hops;
 	p_cache_sw->num_hops = 0;
@@ -978,6 +976,7 @@  void osm_ucast_cache_add_node(osm_ucast_mgr_t * p_mgr, osm_node_t * p_node)
 			/* no LFT buffer, so we use the switch's LFT */
 			p_cache_sw->lft = p_node->sw->lft;
 			p_node->sw->lft = NULL;
+			p_node->sw->lft_size = 0;
 		}
 		p_cache_sw->max_lid_ho = p_node->sw->max_lid_ho;
 	} else {
@@ -1007,6 +1006,7 @@  int osm_ucast_cache_process(osm_ucast_mgr_t * p_mgr)
 	cl_qmap_t *tbl = &p_mgr->p_subn->sw_guid_tbl;
 	cl_map_item_t *item;
 	osm_switch_t *p_sw;
+	uint16_t lft_size;
 
 	if (!p_mgr->p_subn->opt.use_ucast_cache)
 		return 1;
@@ -1028,10 +1028,12 @@  int osm_ucast_cache_process(osm_ucast_mgr_t * p_mgr)
 				   switch, but the LFT needs to be updated anyway */
 				p_sw->new_lft = p_sw->lft;
 
-
-			p_sw->lft = malloc(p_sw->lft_size);
+			lft_size = (p_sw->max_lid_ho / IB_SMP_DATA_SIZE + 1)
+				   * IB_SMP_DATA_SIZE;
+			p_sw->lft = malloc(lft_size);
 			if (!p_sw->lft)
 				return IB_INSUFFICIENT_MEMORY;
+			p_sw->lft_size = lft_size;
 			memset(p_sw->lft, OSM_NO_PATH, p_sw->lft_size);
 		}