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

Commit 511585a2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/qib: Correct sense on freectxts increment and decrement
  RDMA/cma: Verify private data length
  IB/mlx4: Fix shutdown crash accessing a non-existent bitmap
parents 64edb05e 480390c8

drivers/infiniband/core/cma.c

+6 −0
Original line number Diff line number Diff line
@@ -2513,6 +2513,9 @@ static int cma_resolve_ib_udp(struct rdma_id_private *id_priv, 


	req.private_data_len = sizeof(struct cma_hdr) +

			       conn_param->private_data_len;

	if (req.private_data_len < conn_param->private_data_len)

		return -EINVAL;



	req.private_data = kzalloc(req.private_data_len, GFP_ATOMIC);

	if (!req.private_data)

		return -ENOMEM;
@@ -2562,6 +2565,9 @@ static int cma_connect_ib(struct rdma_id_private *id_priv, 
	memset(&req, 0, sizeof req);

	offset = cma_user_data_offset(id_priv->id.ps);

	req.private_data_len = offset + conn_param->private_data_len;

	if (req.private_data_len < conn_param->private_data_len)

		return -EINVAL;



	private_data = kzalloc(req.private_data_len, GFP_ATOMIC);

	if (!private_data)

		return -ENOMEM;

drivers/infiniband/hw/mlx4/main.c

+4 −2
Original line number Diff line number Diff line
@@ -1244,6 +1244,7 @@ err_reg: 


err_counter:

	for (; i; --i)

		if (ibdev->counters[i - 1] != -1)

			mlx4_counter_free(ibdev->dev, ibdev->counters[i - 1]);



err_map:
@@ -1275,6 +1276,7 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) 
	}

	iounmap(ibdev->uar_map);

	for (p = 0; p < ibdev->num_ports; ++p)

		if (ibdev->counters[p] != -1)

			mlx4_counter_free(ibdev->dev, ibdev->counters[p]);

	mlx4_foreach_port(p, dev, MLX4_PORT_TYPE_IB)

		mlx4_CLOSE_PORT(dev, p);

drivers/infiniband/hw/qib/qib_file_ops.c

+2 −2
Original line number Diff line number Diff line
@@ -1285,7 +1285,7 @@ static int setup_ctxt(struct qib_pportdata *ppd, int ctxt, 
	strlcpy(rcd->comm, current->comm, sizeof(rcd->comm));

	ctxt_fp(fp) = rcd;

	qib_stats.sps_ctxts++;

	dd->freectxts++;

	dd->freectxts--;

	ret = 0;

	goto bail;
@@ -1794,7 +1794,7 @@ static int qib_close(struct inode *in, struct file *fp) 
		if (dd->pageshadow)

			unlock_expected_tids(rcd);

		qib_stats.sps_ctxts--;

		dd->freectxts--;

		dd->freectxts++;

	}



	mutex_unlock(&qib_mutex);