[Pkg-ofed-commits] [libfabric] 23/123: prov/sockets: Check hints for NULL before dereferencing.

[Ana Beatriz Guerrero López]

This is an automated email from the git hooks/post-receive script.

ana pushed a commit to annotated tag v1.1.1
in repository libfabric.

commit 0f140308bc4c10c956be1e5b7d9af4d4e1d71e87
Author: Ben Turrubiates <bturrubi at cisco.com>
Date:   Thu Aug 27 14:28:51 2015 -0700

    prov/sockets: Check hints for NULL before dereferencing.
    
    Fixes SEGV when no options are given to fi_info.
    
    Signed-off-by: Ben Turrubiates <bturrubi at cisco.com>
---
 prov/sockets/src/sock_ep_dgram.c | 2 +-
 prov/sockets/src/sock_ep_msg.c   | 2 +-
 prov/sockets/src/sock_ep_rdm.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/prov/sockets/src/sock_ep_dgram.c b/prov/sockets/src/sock_ep_dgram.c
index 8a628e1..2af6386 100644
--- a/prov/sockets/src/sock_ep_dgram.c
+++ b/prov/sockets/src/sock_ep_dgram.c
@@ -227,7 +227,7 @@ int sock_dgram_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	(*info)->caps = SOCK_EP_DGRAM_CAP |
                        (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-        if (hints->caps)
+        if (hints && hints->caps)
                 (*info)->caps = SOCK_EP_DGRAM_SEC_CAP | hints->caps;
 
 	return 0;
diff --git a/prov/sockets/src/sock_ep_msg.c b/prov/sockets/src/sock_ep_msg.c
index 25a19e3..f96faa6 100644
--- a/prov/sockets/src/sock_ep_msg.c
+++ b/prov/sockets/src/sock_ep_msg.c
@@ -229,7 +229,7 @@ int sock_msg_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	(*info)->caps = SOCK_EP_MSG_CAP |
                        (*info)->rx_attr->caps | (*info)->tx_attr->caps;
-        if (hints->caps)
+        if (hints && hints->caps)
                 (*info)->caps = SOCK_EP_MSG_SEC_CAP | hints->caps;
 
 	return 0;
diff --git a/prov/sockets/src/sock_ep_rdm.c b/prov/sockets/src/sock_ep_rdm.c
index 40a22d0..6a5d294 100644
--- a/prov/sockets/src/sock_ep_rdm.c
+++ b/prov/sockets/src/sock_ep_rdm.c
@@ -272,7 +272,7 @@ int sock_rdm_fi_info(void *src_addr, void *dest_addr, struct fi_info *hints,
 
 	(*info)->caps = SOCK_EP_RDM_CAP |
 			(*info)->rx_attr->caps | (*info)->tx_attr->caps;
-	if (hints->caps)
+	if (hints && hints->caps)
 		(*info)->caps = SOCK_EP_RDM_SEC_CAP | hints->caps;
 
 	return 0;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/libfabric.git