IB/mthca: Check alternate P_Key index when setting alternate path

Check that the alternate P_Key index is in range when setting the
alternate path for a QP.  Also make a cosmetic touch up to the debug
message printed when the main P_Key index is out of range.

Signed-off-by: Dotan Barak <dotanb@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

1 files changed, 8 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index c24260845bfd..f673c461e30b 100644
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -536,8 +536,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
 
         if ((attr_mask & IB_QP_PKEY_INDEX) &&
              attr->pkey_index >= dev->limits.pkey_table_len) {
-                mthca_dbg(dev, "PKey index (%u) too large. max is %d\n",
-                          attr->pkey_index,dev->limits.pkey_table_len-1);
+                mthca_dbg(dev, "P_Key index (%u) too large. max is %d\n",
+                          attr->pkey_index, dev->limits.pkey_table_len-1);
                 return -EINVAL;
         }
 
@@ -652,6 +652,12 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask)
         }
 
         if (attr_mask & IB_QP_ALT_PATH) {
+                if (attr->alt_pkey_index >= dev->limits.pkey_table_len) {
+                        mthca_dbg(dev, "Alternate P_Key index (%u) too large. max is %d\n",
+                                  attr->alt_pkey_index, dev->limits.pkey_table_len-1);
+                        return -EINVAL;
+                }
+
                 if (attr->alt_port_num == 0 || attr->alt_port_num > dev->limits.num_ports) {
                         mthca_dbg(dev, "Alternate port number (%u) is invalid\n",
                                 attr->alt_port_num);