[PATCHv2} opensm/osm_torus.c: Fix crash in torus_update_osm_vlarb

2012-12-03 Thread Hal Rosenstock

Signed-off-by: Alex Netes ale...@mellanox.com
Signed-off-by: Hal Rosenstock h...@mellanox.com
---
Change since v1:
Fixed NULL pointer check on sw-port[port_num]
Pointed out by: Jim Schutt jasc...@sandia.gov

 opensm/osm_torus.c |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opensm/osm_torus.c b/opensm/osm_torus.c
index c06f8d4..075f84a 100644
--- a/opensm/osm_torus.c
+++ b/opensm/osm_torus.c
@@ -8089,7 +8089,7 @@ void torus_update_osm_vlarb(void *context, osm_physp_t 
*osm_phys_port,
 * So, leave VL 0 alone, remap VL 4 to VL 1, zero out the rest,
 * and compress out the zero entries to the end.
 */
-   if (!sw || !port_num ||
+   if (!sw || !port_num || !sw-port[port_num] ||
sw-port[port_num]-pgrp-port_grp != 2 * TORUS_MAX_DIM)
return;
  
-- 
1.7.8.2

--
To unsubscribe from this list: send the line unsubscribe linux-rdma in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCHv2} opensm/osm_torus.c: Fix crash in torus_update_osm_vlarb

2012-12-03 Thread Jim Schutt

On 12/03/2012 02:25 PM, Hal Rosenstock wrote:


Signed-off-by: Alex Netesale...@mellanox.com
Signed-off-by: Hal Rosenstockh...@mellanox.com


Acked-by: Jim Schutt jasc...@sandia.gov


---
Change since v1:
Fixed NULL pointer check on sw-port[port_num]
Pointed out by: Jim Schuttjasc...@sandia.gov

  opensm/osm_torus.c |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/opensm/osm_torus.c b/opensm/osm_torus.c
index c06f8d4..075f84a 100644
--- a/opensm/osm_torus.c
+++ b/opensm/osm_torus.c
@@ -8089,7 +8089,7 @@ void torus_update_osm_vlarb(void *context, osm_physp_t 
*osm_phys_port,
 * So, leave VL 0 alone, remap VL 4 to VL 1, zero out the rest,
 * and compress out the zero entries to the end.
 */
-   if (!sw || !port_num ||
+   if (!sw || !port_num || !sw-port[port_num] ||
sw-port[port_num]-pgrp-port_grp != 2 * TORUS_MAX_DIM)
return;




--
To unsubscribe from this list: send the line unsubscribe linux-rdma in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html