opensm/osm_trap_rcv.c: fix possible core dump
PATCH 1/1 opensm/osm_trap_rcv.c: fix possible core dump
Handle the case when source physical port
for trap 145 wasn't found.
--- opensm/opensm/osm_trap_rcv.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
opensm/opensm/osm_trap_rcv.c +10 -4
@@ -510,10 +510,16 @@ static void trap_rcv_process_request(IN osm_sm_t * sm,"ERR 3812: No physical port found for " "trap 144: \"node description update\"\n"); goto check_sweep; - }else if (cl_ntoh16 (p_ntci->g_or_v.generic.trap_num) ==145 ) -/* this assumes that trap 145 content is not broken? */ - p_physp->p_node->node_info.sys_guid = - p_ntci->data_details.ntc_145.new_sys_guid; + }else if (cl_ntoh16 (p_ntci->g_or_v.generic.trap_num) ==145 ) { +if (p_physp) +/* this assumes that trap 145 content is not broken? */ + p_physp->p_node->node_info.sys_guid = + p_ntci->data_details.ntc_145.new_sys_guid; +else +OSM_LOG (sm->p_log,OSM_LOG_ERROR , +"ERR 3813: No physical port found for " +"trap 145: \"SystemImageGUID update\"\n" ); + } check_sweep:/* do a sweep if we received a trap */
Signature · 6 lines
1.6.2.4 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
A message that is not in the archive (sent off-list or not yet received): 4C8651CF.2080807-VPRAkNaXOzVS1MOuV/[email protected]
Quoted 20 lines · Yevgeny Kliteynik
Handle the case when source physical port
for trap 145 wasn't found.Signed-off-by Yevgeny Kliteynik <[email protected]>--- opensm/opensm/osm_trap_rcv.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)opensm/opensm/osm_trap_rcv.c +0
-4@@ -510,10 +510,16 @@ static void trap_rcv_process_request(IN osm_sm_t * sm,"ERR 3812: No physical port found for " "trap 144: \"node description update\"\n"); goto check_sweep; - }else if (cl_ntoh16 (p_ntci->g_or_v.generic.trap_num) ==145 ) -/* this assumes that trap 145 content is not broken? */ - p_physp->p_node->node_info.sys_guid = - p_ntci->data_details.ntc_145.new_sys_guid;
opensm/opensm/osm_trap_rcv.c static void trap_rcv_process_request(IN osm_sm_t * sm, · line 522
Quoted 10 lines
opensm/opensm/osm_trap_rcv.c +10
-0+ }else if (cl_ntoh16 (p_ntci->g_or_v.generic.trap_num) ==145 ) { +if (p_physp) +/* this assumes that trap 145 content is not broken? */ + p_physp->p_node->node_info.sys_guid = + p_ntci->data_details.ntc_145.new_sys_guid; +else +OSM_LOG (sm->p_log,OSM_LOG_ERROR , +"ERR 3813: No physical port found for " +"trap 145: \"SystemImageGUID update\"\n" ); + }
Wouldn't it be better to make such check for all traps and not separately for selected values?
Sasha
Quoted 6 lines
opensm/opensm/osm_trap_rcv.c +0
-0check_sweep:/* do a sweep if we received a trap */ Signature · 1 line
1.6.2.4
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 26 lines · Sasha Khapyorsky
Quoted 25 lines · Yevgeny Kliteynik
Handle the case when source physical port
for trap 145 wasn't found.Signed-off-by Yevgeny Kliteynik<[email protected]>--- opensm/opensm/osm_trap_rcv.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)opensm/opensm/osm_trap_rcv.c +5
-4@@ -510,10 +510,16 @@ static void trap_rcv_process_request(IN osm_sm_t * sm,"ERR 3812: No physical port found for " "trap 144: \"node description update\"\n"); goto check_sweep; - }else if (cl_ntoh16 (p_ntci->g_or_v.generic.trap_num) ==145 ) -/* this assumes that trap 145 content is not broken? */ - p_physp->p_node->node_info.sys_guid = - p_ntci->data_details.ntc_145.new_sys_guid; + }else if (cl_ntoh16 (p_ntci->g_or_v.generic.trap_num) ==145 ) { +if (p_physp) +/* this assumes that trap 145 content is not broken? */ + p_physp->p_node->node_info.sys_guid = + p_ntci->data_details.ntc_145.new_sys_guid;
Quoted 8 lines
opensm/opensm/osm_trap_rcv.c static void trap_rcv_process_request(IN osm_sm_t * sm, · line 522
Quoted 5 lines
opensm/opensm/osm_trap_rcv.c +5
-0+else +OSM_LOG (sm->p_log,OSM_LOG_ERROR , +"ERR 3813: No physical port found for " +"trap 145: \"SystemImageGUID update\"\n" ); + }Wouldn't it be better to make such check for all traps and not separately for selected values?
Such check exists:
407 if (p_physp)
408 p_smp->m_key = p_physp->port_info.m_key;
409 else
410 OSM_LOG(sm->p_log, OSM_LOG_ERROR, "ERR 3809: "
411 "Failed to find source physical port for trap\n");
However, even if p_physp wasn't found, the function continues, and for each trap it is doing something else. For instance, p_physp can be absent, but trap 144 will still cause heavy sweep.
-- Yevgeny
Quoted 9 lines
Sasha
Quoted 6 lines
opensm/opensm/osm_trap_rcv.c +0
-0check_sweep:/* do a sweep if we received a trap */ Signature · 1 line
1.6.2.4
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Sasha Khapyorsky
AppliedQuoted 4 lines · Yevgeny Kliteynik
Handle the case when source physical port
for trap 145 wasn't found.Signed-off-by Yevgeny Kliteynik <[email protected]>
Applied. Thanks.
Sasha
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html