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

Commit a9dbf5c8 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:
 "Third round of -rc fixes for 4.10 kernel:

   - two security related issues in the rxe driver

   - one compile issue in the RDMA uapi header"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma:
  RDMA: Don't reference kernel private header from UAPI header
  IB/rxe: Fix mem_check_range integer overflow
  IB/rxe: Fix resid update
parents aca9fa0c 646ebd41

drivers/infiniband/sw/rxe/rxe_mr.c

+5 −3
Original line number Diff line number Diff line
@@ -59,9 +59,11 @@ int mem_check_range(struct rxe_mem *mem, u64 iova, size_t length) 


	case RXE_MEM_TYPE_MR:

	case RXE_MEM_TYPE_FMR:

		return ((iova < mem->iova) ||

			((iova + length) > (mem->iova + mem->length))) ?

			-EFAULT : 0;

		if (iova < mem->iova ||

		    length > mem->length ||

		    iova > mem->iova + mem->length - length)

			return -EFAULT;

		return 0;



	default:

		return -EFAULT;

drivers/infiniband/sw/rxe/rxe_resp.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static enum resp_states check_rkey(struct rxe_qp *qp, 
				goto err2;

			}



			resid = mtu;

			qp->resp.resid = mtu;

		} else {

			if (pktlen != resid) {

				state = RESPST_ERR_LENGTH;

include/uapi/rdma/ib_user_verbs.h

+8 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#define IB_USER_VERBS_H



#include <linux/types.h>

#include <rdma/ib_verbs.h>



/*

 * Increment this value if any changes that break userspace ABI
@@ -548,11 +547,17 @@ enum { 
};



enum {

	IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN

	/*

	 * This value is equal to IB_QP_DEST_QPN.

	 */

	IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,

};



enum {

	IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT

	/*

	 * This value is equal to IB_QP_RATE_LIMIT.

	 */

	IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,

};



struct ib_uverbs_ex_create_qp {