[PATCH] opensm/osm_ucast_cache.c: fix potential seg fault

[PATCH] opensm/osm_ucast_cache.c: fix potential seg fault

[Yevgeny Kliteynik]

Fix potential seg fault when NULL is returned

Signed-off-by: Yevgeny Kliteynik <kliteyn-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
---
 opensm/opensm/osm_ucast_cache.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/opensm/opensm/osm_ucast_cache.c b/opensm/opensm/osm_ucast_cache.c
index c611c38..be15508 100644
--- a/opensm/opensm/osm_ucast_cache.c
+++ b/opensm/opensm/osm_ucast_cache.c
@@ -931,6 +931,14 @@ void osm_ucast_cache_add_node(osm_ucast_mgr_t * p_mgr, osm_node_t * p_node)

 		p_cache_sw = cache_get_sw(p_mgr, lid_ho);
 		CL_ASSERT(p_cache_sw);
+		if (!p_cache_sw) {
+			/* something is wrong - forget about cache */
+			OSM_LOG(p_mgr->p_log, OSM_LOG_ERROR,
+				"ERR AD04: no cached switch with lid %u - "
+				"clearing cache\n", lid_ho);
+			osm_ucast_cache_invalidate(p_mgr);
+			goto Exit;
+		}

 		if (!cache_sw_is_leaf(p_cache_sw)) {
 			OSM_LOG(p_mgr->p_log, OSM_LOG_DEBUG,
-- 
1.6.2.4

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

Re: [PATCH] opensm/osm_ucast_cache.c: fix potential seg fault

[Sasha Khapyorsky]

Hi Yevgeny,

On 17:54 Tue 07 Sep     , Yevgeny Kliteynik wrote:
> Fix potential seg fault when NULL is returned
> 
> Signed-off-by: Yevgeny Kliteynik <kliteyn-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
> ---
>  opensm/opensm/osm_ucast_cache.c |    8 ++++++++
>  1 files changed, 8 insertions(+), 0 deletions(-)
> 
> diff --git a/opensm/opensm/osm_ucast_cache.c b/opensm/opensm/osm_ucast_cache.c
> index c611c38..be15508 100644
> --- a/opensm/opensm/osm_ucast_cache.c
> +++ b/opensm/opensm/osm_ucast_cache.c
> @@ -931,6 +931,14 @@ void osm_ucast_cache_add_node(osm_ucast_mgr_t * p_mgr, osm_node_t * p_node)
> 
>  		p_cache_sw = cache_get_sw(p_mgr, lid_ho);
>  		CL_ASSERT(p_cache_sw);
> +		if (!p_cache_sw) {
> +			/* something is wrong - forget about cache */
> +			OSM_LOG(p_mgr->p_log, OSM_LOG_ERROR,
> +				"ERR AD04: no cached switch with lid %u - "
> +				"clearing cache\n", lid_ho);
> +			osm_ucast_cache_invalidate(p_mgr);
> +			goto Exit;
> +		}

Is this a valid case when NULL is returned here? When is this possible?
And in any case we obviously don't need both CL_ASSERT() and run time
check here.

Sasha

> 
>  		if (!cache_sw_is_leaf(p_cache_sw)) {
>  			OSM_LOG(p_mgr->p_log, OSM_LOG_DEBUG,
> -- 
> 1.6.2.4
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html