diff mbox

[opensm] osm_qos.c: Fix possible seg fault

Message ID 52F0FFA4.6000807@dev.mellanox.co.il (mailing list archive)
State Accepted
Delegated to: Hal Rosenstock
Headers show

Commit Message

Hal Rosenstock Feb. 4, 2014, 2:56 p.m. UTC 
From: Alex Netes <alexne@mellanox.com>

Pointed-out-by: Jens Domke <domke.j.aa@m.titech.ac.jp>
Introduced by commit 1633550020087f3296dbc2f7b1dd533cd83a6398

If force_update is set, p_tbl isn't initialized

Signed-off-by: Alex Netes <alexne@mellanox.com>
---
 opensm/osm_qos.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
diff mbox

Patch

diff --git a/opensm/osm_qos.c b/opensm/osm_qos.c
index f55a509..b174f66 100644
--- a/opensm/osm_qos.c
+++ b/opensm/osm_qos.c
@@ -248,8 +248,9 @@  static ib_api_status_t sl2vl_update_table(osm_sm_t * sm, osm_physp_t * p,
 		tbl.raw_vl_by_sl[i] = (vl1 << 4) | vl2;
 	}
 
-	if (!force_update && (p_tbl = osm_physp_get_slvl_tbl(p, in_port)) &&
-	    !memcmp(p_tbl, &tbl, sizeof(tbl)))
+	p_tbl = osm_physp_get_slvl_tbl(p, in_port);
+
+	if (!force_update && !memcmp(p_tbl, &tbl, sizeof(tbl)))
 		return IB_SUCCESS;
 
 	p_mad = osm_qos_mad_create(sm, p, sizeof(tbl), (uint8_t *) & tbl,