From: Daniel Jurgens <dani...@mellanox.com>

Check the return value from get_pkey_and_subnet_prefix to prevent using
uninitialized variables.

Fixes: d291f1a65232 ("IB/core: Enforce PKey security on QPs")
Signed-off-by: Daniel Jurgens <dani...@mellanox.com>
Reported-by: Dan Carpenter <dan.carpen...@oracle.com>
---
 drivers/infiniband/core/security.c | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/drivers/infiniband/core/security.c 
b/drivers/infiniband/core/security.c
index 3e8c389..70ad19c 100644
--- a/drivers/infiniband/core/security.c
+++ b/drivers/infiniband/core/security.c
@@ -120,21 +120,25 @@ static int check_qp_port_pkey_settings(struct 
ib_ports_pkeys *pps,
                return 0;
 
        if (pps->main.state != IB_PORT_PKEY_NOT_VALID) {
-               get_pkey_and_subnet_prefix(&pps->main,
-                                          &pkey,
-                                          &subnet_prefix);
+               ret = get_pkey_and_subnet_prefix(&pps->main,
+                                                &pkey,
+                                                &subnet_prefix);
+               if (ret)
+                       return ret;
 
                ret = enforce_qp_pkey_security(pkey,
                                               subnet_prefix,
                                               sec);
+               if (ret)
+                       return ret;
        }
-       if (ret)
-               return ret;
 
        if (pps->alt.state != IB_PORT_PKEY_NOT_VALID) {
-               get_pkey_and_subnet_prefix(&pps->alt,
-                                          &pkey,
-                                          &subnet_prefix);
+               ret = get_pkey_and_subnet_prefix(&pps->alt,
+                                                &pkey,
+                                                &subnet_prefix);
+               if (ret)
+                       return ret;
 
                ret = enforce_qp_pkey_security(pkey,
                                               subnet_prefix,
-- 
1.8.3.1

Reply via email to