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

Commit 925d96a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull rdma fixes from Doug Ledford:
 "Final set of -rc fixes for 4.6.

  I've collected up a number of patches that are all pretty small with
  the exception of only a couple.  The hfi1 driver has a number of
  important patches, and it is what really drives the line count of this
  pull request up.  These are all small and I've got this kernel built
  and running in the test lab (I have most of the hardware, I think nes
  is the only thing in this patch set that I can't say I've personally
  tested and have up and running).

  Summary:

   - A number of collected fixes for oopses, memory corruptions,
     deadlocks, etc.  All of these fixes are small (many only 5-10
     lines), obvious, and tested.

   - Fix for the security issue related to the use of write for
     bi-directional communications"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  RDMA/nes: don't leak skb if carrier down
  IB/security: Restrict use of the write() interface
  IB/hfi1: Use kernel default llseek for ui device
  IB/hfi1: Don't attempt to free resources if initialization failed
  IB/hfi1: Fix missing lock/unlock in verbs drain callback
  IB/rdmavt: Fix send scheduling
  IB/hfi1: Prevent unpinning of wrong pages
  IB/hfi1: Fix deadlock caused by locking with wrong scope
  IB/hfi1: Prevent NULL pointer deferences in caching code
  MAINTAINERS: Update iser/isert maintainer contact info
  IB/mlx5: Expose correct max_sge_rd limit
  RDMA/iw_cxgb4: Fix bar2 virt addr calculation for T4 chips
  iw_cxgb4: handle draining an idle qp
  iw_cxgb3: initialize ibdev.iwcm->ifname for port mapping
  iw_cxgb4: initialize ibdev.iwcm->ifname for port mapping
  IB/core: Don't drain non-existent rq queue-pair
  IB/core: Fix oops in ib_cache_gid_set_default_gid
parents 1d003af2 4c8bb959

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -6027,7 +6027,7 @@ F: include/scsi/*iscsi* 


ISCSI EXTENSIONS FOR RDMA (ISER) INITIATOR

M:	Or Gerlitz <ogerlitz@mellanox.com>

M:	Sagi Grimberg <sagig@mellanox.com>

M:	Sagi Grimberg <sagi@grimberg.me>

M:	Roi Dayan <roid@mellanox.com>

L:	linux-rdma@vger.kernel.org

S:	Supported
@@ -6037,7 +6037,7 @@ Q: http://patchwork.kernel.org/project/linux-rdma/list/ 
F:	drivers/infiniband/ulp/iser/



ISCSI EXTENSIONS FOR RDMA (ISER) TARGET

M:	Sagi Grimberg <sagig@mellanox.com>

M:	Sagi Grimberg <sagi@grimberg.me>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master

L:	linux-rdma@vger.kernel.org

L:	target-devel@vger.kernel.org

drivers/infiniband/core/cache.c

+2 −1
Original line number Diff line number Diff line
@@ -691,7 +691,8 @@ void ib_cache_gid_set_default_gid(struct ib_device *ib_dev, u8 port, 
			      NULL);



		/* Coudn't find default GID location */

		WARN_ON(ix < 0);

		if (WARN_ON(ix < 0))

			goto release;



		zattr_type.gid_type = gid_type;

drivers/infiniband/core/ucm.c

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 


#include <asm/uaccess.h>



#include <rdma/ib.h>

#include <rdma/ib_cm.h>

#include <rdma/ib_user_cm.h>

#include <rdma/ib_marshall.h>
@@ -1103,6 +1104,9 @@ static ssize_t ib_ucm_write(struct file *filp, const char __user *buf, 
	struct ib_ucm_cmd_hdr hdr;

	ssize_t result;



	if (WARN_ON_ONCE(!ib_safe_file_access(filp)))

		return -EACCES;



	if (len < sizeof(hdr))

		return -EINVAL;

drivers/infiniband/core/ucma.c

+3 −0
Original line number Diff line number Diff line
@@ -1574,6 +1574,9 @@ static ssize_t ucma_write(struct file *filp, const char __user *buf, 
	struct rdma_ucm_cmd_hdr hdr;

	ssize_t ret;



	if (WARN_ON_ONCE(!ib_safe_file_access(filp)))

		return -EACCES;



	if (len < sizeof(hdr))

		return -EINVAL;

drivers/infiniband/core/uverbs_main.c

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 


#include <asm/uaccess.h>



#include <rdma/ib.h>



#include "uverbs.h"



MODULE_AUTHOR("Roland Dreier");
@@ -709,6 +711,9 @@ static ssize_t ib_uverbs_write(struct file *filp, const char __user *buf, 
	int srcu_key;

	ssize_t ret;



	if (WARN_ON_ONCE(!ib_safe_file_access(filp)))

		return -EACCES;



	if (count < sizeof hdr)

		return -EINVAL;