Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3b5ad89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma fixes from Jason Gunthorpe:
 "More fixes from testing done on the rc kernel, including more SELinux
  testing. Looking forward, lockdep found regression today in ipoib
  which is still being fixed.

  Summary:

   - Fix for SELinux on the umad SMI path. Some old hardware does not
     fill the PKey properly exposing another bug in the newer SELinux
     code.

   - Check the input port as we can exceed array bounds from this user
     supplied value

   - Users are unable to use the hash field support as they want due to
     incorrect checks on the field restrictions, correct that so the
     feature works as intended

   - User triggerable oops in the NETLINK_RDMA handler

   - cxgb4 driver fix for a bad interaction with CQ flushing in iser
     caused by patches in this merge window, and bad CQ flushing during
     normal close.

   - Unbalanced memalloc_noio in ipoib in an error path"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  IB/ipoib: Restore MM behavior in case of tx_ring allocation failure
  iw_cxgb4: only insert drain cqes if wq is flushed
  iw_cxgb4: only clear the ARMED bit if a notification is needed
  RDMA/netlink: Fix general protection fault
  IB/mlx4: Fix RSS hash fields restrictions
  IB/core: Don't enforce PKey security on SMI MADs
  IB/core: Bound check alternate path port number
parents f25e2295 9d98e19b

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -4458,7 +4458,7 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb) 
	return skb->len;

}



static const struct rdma_nl_cbs cma_cb_table[] = {

static const struct rdma_nl_cbs cma_cb_table[RDMA_NL_RDMA_CM_NUM_OPS] = {

	[RDMA_NL_RDMA_CM_ID_STATS] = { .dump = cma_get_id_stats},

};

drivers/infiniband/core/device.c

+1 −1
Original line number Diff line number Diff line
@@ -1146,7 +1146,7 @@ struct net_device *ib_get_net_dev_by_params(struct ib_device *dev, 
}

EXPORT_SYMBOL(ib_get_net_dev_by_params);



static const struct rdma_nl_cbs ibnl_ls_cb_table[] = {

static const struct rdma_nl_cbs ibnl_ls_cb_table[RDMA_NL_LS_NUM_OPS] = {

	[RDMA_NL_LS_OP_RESOLVE] = {

		.doit = ib_nl_handle_resolve_resp,

		.flags = RDMA_NL_ADMIN_PERM,

drivers/infiniband/core/iwcm.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ const char *__attribute_const__ iwcm_reject_msg(int reason) 
}

EXPORT_SYMBOL(iwcm_reject_msg);



static struct rdma_nl_cbs iwcm_nl_cb_table[] = {

static struct rdma_nl_cbs iwcm_nl_cb_table[RDMA_NL_IWPM_NUM_OPS] = {

	[RDMA_NL_IWPM_REG_PID] = {.dump = iwpm_register_pid_cb},

	[RDMA_NL_IWPM_ADD_MAPPING] = {.dump = iwpm_add_mapping_cb},

	[RDMA_NL_IWPM_QUERY_MAPPING] = {.dump = iwpm_add_and_query_mapping_cb},

drivers/infiniband/core/nldev.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ out: cb->args[0] = idx; 
	return skb->len;

}



static const struct rdma_nl_cbs nldev_cb_table[] = {

static const struct rdma_nl_cbs nldev_cb_table[RDMA_NLDEV_NUM_OPS] = {

	[RDMA_NLDEV_CMD_GET] = {

		.doit = nldev_get_doit,

		.dump = nldev_get_dumpit,

drivers/infiniband/core/security.c

+5 −2
Original line number Diff line number Diff line
@@ -739,8 +739,11 @@ int ib_mad_enforce_security(struct ib_mad_agent_private *map, u16 pkey_index) 
	if (!rdma_protocol_ib(map->agent.device, map->agent.port_num))

		return 0;



	if (map->agent.qp->qp_type == IB_QPT_SMI && !map->agent.smp_allowed)

	if (map->agent.qp->qp_type == IB_QPT_SMI) {

		if (!map->agent.smp_allowed)

			return -EACCES;

		return 0;

	}



	return ib_security_pkey_access(map->agent.device,

				       map->agent.port_num,