Commit 67e73776 authored by Dotan Barak's avatar Dotan Barak Committed by Roland Dreier
Browse files

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: default avatarDotan Barak <dotanb@mellanox.co.il>
Signed-off-by: default avatarRoland Dreier <rolandd@cisco.com>
parent 7667abd1

drivers/infiniband/hw/mthca/mthca_qp.c

+8 −2
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ 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",

		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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE