In osm_ucast_mgr, where osm_req_set is called for SwitchInfo,

fix bug where it copies more memory than it should into the SMP.

While running opensm with valgrind, it was found out that there is a
problem  with osm_req_set function. It clears the madw.data by size of
IB_SMP_DATA_SIZE, but the function doesn't require a payload of this
size. In osm_ucast_mgr there was a call to the function with a payload
of smaller size (for SwitchInfo).

To fix it, payload_size to the osm_req_set was added.

git-svn-id: svn://openib.tc.cornell.edu/gen1@144 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/opensm/user/include/opensm/osm_req.h b/trunk/ulp/opensm/user/include/opensm/osm_req.h
index 72e4ff00e3f8d0de8f9a7c98c172ab97613b7f50..43c3aa4b1efbe13053a0c5997286ea7ff2f43633 100644 (file)
--- a/trunk/ulp/opensm/user/include/opensm/osm_req.h
+++ b/trunk/ulp/opensm/user/include/opensm/osm_req.h
@@ -305,6 +305,7 @@ osm_req_set(
        IN const osm_req_t* const p_req,
        IN const osm_dr_path_t* const p_path,
        IN const uint8_t* const p_payload,
+   IN const size_t payload_size,
        IN const uint16_t attr_id,
        IN const uint32_t attr_mod,
        IN const cl_disp_msgid_t err_msg,
@@ -320,6 +321,9 @@ osm_req_set(
 *      p_payload
 *              [in] Pointer to the SMP payload to send.
 *
+*  payload_size
+*              [in] The size of the payload to be copied to the SMP data field.
+*
 *      attr_id
 *              [in] Attribute ID to request.
 *

diff --git a/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c b/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c
index c1042afa26c0de3744fb6079c978caf88e49351c..f06fae3f662dfb57ca32173e4f13baec3ec28df7 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c
+++ b/trunk/ulp/opensm/user/opensm/osm_lid_mgr.c
@@ -1151,6 +1151,7 @@ __osm_lid_mgr_set_physp_pi(
     status = osm_req_set( p_mgr->p_req,
                           osm_physp_get_dr_path_ptr( p_physp ),
                           payload,
+                          sizeof(payload),
                           IB_MAD_ATTR_PORT_INFO,
                           cl_hton32(osm_physp_get_port_num( p_physp )),
                           CL_DISP_MSGID_NONE,

diff --git a/trunk/ulp/opensm/user/opensm/osm_link_mgr.c b/trunk/ulp/opensm/user/opensm/osm_link_mgr.c
index 469c5916d623eb1f9146daadac65b7e785cbd067..cf99298c7e1ca9486693ecfddfbfe3455ef9259a 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_link_mgr.c
+++ b/trunk/ulp/opensm/user/opensm/osm_link_mgr.c
@@ -352,6 +352,7 @@ osm_link_mgr_set_physp_pi(
     status = osm_req_set( p_mgr->p_req,
                           osm_physp_get_dr_path_ptr( p_physp ),
                           payload,
+                          sizeof(payload),
                           IB_MAD_ATTR_PORT_INFO,
                           cl_hton32(port_num),
                           CL_DISP_MSGID_NONE,

diff --git a/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c b/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c
index b152fc3e821f87c9cb428fb2028186b9f086f7e4..4401c96ba947f5f1f687e45aee61b8d13d1e7de7 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c
+++ b/trunk/ulp/opensm/user/opensm/osm_mcast_mgr.c
@@ -485,6 +485,7 @@ __osm_mcast_mgr_set_tbl(
     status = osm_req_set( p_mgr->p_req,
                           p_path,
                           (void*)block,
+                          sizeof(block),
                           IB_MAD_ATTR_MCAST_FWD_TBL,
                           cl_hton32( block_id_ho ),
                           CL_DISP_MSGID_NONE,

diff --git a/trunk/ulp/opensm/user/opensm/osm_req.c b/trunk/ulp/opensm/user/opensm/osm_req.c
index 908bb9f80939f1a2fb3fd13d2f5e197f05032514..7306a9df6d64049d84996d971014dc6c24a55b49 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_req.c
+++ b/trunk/ulp/opensm/user/opensm/osm_req.c
@@ -207,6 +207,7 @@ osm_req_set(
   IN const osm_req_t* const p_req,
   IN const osm_dr_path_t* const p_path,
   IN const uint8_t* const p_payload,
+  IN const size_t payload_size,
   IN const uint16_t attr_id,
   IN const uint32_t attr_mod,
   IN const cl_disp_msgid_t err_msg,
@@ -283,7 +284,7 @@ osm_req_set(
     p_madw->context = *p_context;
 
   cl_memcpy( osm_madw_get_smp_ptr( p_madw )->data,
-             p_payload, IB_SMP_DATA_SIZE );
+             p_payload, payload_size );
 
   osm_vl15_post( p_req->p_vl15, p_madw );
 

diff --git a/trunk/ulp/opensm/user/opensm/osm_state_mgr.c b/trunk/ulp/opensm/user/opensm/osm_state_mgr.c
index df29764d1c916a11933aac4d450175714161e436..3d94c45d27f7db894863e6e7f996e966e86c04b6 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_state_mgr.c
+++ b/trunk/ulp/opensm/user/opensm/osm_state_mgr.c
@@ -1665,6 +1665,7 @@ __osm_state_mgr_send_handover(
    status = osm_req_set( p_mgr->p_req,
                          osm_physp_get_dr_path_ptr
                          ( osm_port_get_default_phys_ptr( p_port ) ), payload,
+                         sizeof(payload),
                          IB_MAD_ATTR_SM_INFO, IB_SMINFO_ATTR_MOD_HANDOVER,
                          CL_DISP_MSGID_NONE, &context );
 

diff --git a/trunk/ulp/opensm/user/opensm/osm_sw_info_rcv.c b/trunk/ulp/opensm/user/opensm/osm_sw_info_rcv.c
index 5ac945df1a0c47c12393bf3a9b940f9c2b5b696c..51762ae3eabf87a3cbad8ade662382b80e7377cf 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_sw_info_rcv.c
+++ b/trunk/ulp/opensm/user/opensm/osm_sw_info_rcv.c
@@ -81,6 +81,7 @@ __osm_si_rcv_clear_sc_bit(
   status = osm_req_set( p_rcv->p_req,
                         osm_node_get_any_dr_path_ptr( p_node ),
                         payload,
+                        sizeof(payload),
                         IB_MAD_ATTR_SWITCH_INFO,
                         0,
                         CL_DISP_MSGID_NONE,

diff --git a/trunk/ulp/opensm/user/opensm/osm_ucast_mgr.c b/trunk/ulp/opensm/user/opensm/osm_ucast_mgr.c
index 796eb9408057b6432f339ad722313ac851ba99b7..2a93e9ca8a98a23a1856a8fe1dcc9abf5ce88594 100644 (file)
--- a/trunk/ulp/opensm/user/opensm/osm_ucast_mgr.c
+++ b/trunk/ulp/opensm/user/opensm/osm_ucast_mgr.c
@@ -847,6 +847,7 @@ __osm_ucast_mgr_set_table(
   status = osm_req_set( p_mgr->p_req,
                         p_path,
                         (uint8_t*)&si,
+                        sizeof(si),
                         IB_MAD_ATTR_SWITCH_INFO,
                         0,
                         CL_DISP_MSGID_NONE,
@@ -881,6 +882,7 @@ __osm_ucast_mgr_set_table(
     status = osm_req_set( p_mgr->p_req,
                           p_path,
                           block,
+                          sizeof(block),
                           IB_MAD_ATTR_LIN_FWD_TBL,
                           cl_hton32( block_id_ho ),
                           CL_DISP_MSGID_NONE,