Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+14
-7
+5
-3
drivers/infiniband/sw/rxe/rxe_mr.c
+5
-3
drivers/infiniband/sw/rxe/rxe_mr.c
···
59
59
60
60
case RXE_MEM_TYPE_MR:
61
61
case RXE_MEM_TYPE_FMR:
62
-
return ((iova < mem->iova) ||
63
-
((iova + length) > (mem->iova + mem->length))) ?
64
-
-EFAULT : 0;
62
+
if (iova < mem->iova ||
63
+
length > mem->length ||
64
+
iova > mem->iova + mem->length - length)
65
+
return -EFAULT;
66
+
return 0;
65
67
66
68
default:
67
69
return -EFAULT;
+1
-1
drivers/infiniband/sw/rxe/rxe_resp.c
+1
-1
drivers/infiniband/sw/rxe/rxe_resp.c
+8
-3
include/uapi/rdma/ib_user_verbs.h
+8
-3
include/uapi/rdma/ib_user_verbs.h
···
37
37
#define IB_USER_VERBS_H
38
38
39
39
#include <linux/types.h>
40
-
#include <rdma/ib_verbs.h>
41
40
42
41
/*
43
42
* Increment this value if any changes that break userspace ABI
···
547
548
};
548
549
549
550
enum {
550
-
IB_USER_LEGACY_LAST_QP_ATTR_MASK = IB_QP_DEST_QPN
551
+
/*
552
+
* This value is equal to IB_QP_DEST_QPN.
553
+
*/
554
+
IB_USER_LEGACY_LAST_QP_ATTR_MASK = 1ULL << 20,
551
555
};
552
556
553
557
enum {
554
-
IB_USER_LAST_QP_ATTR_MASK = IB_QP_RATE_LIMIT
558
+
/*
559
+
* This value is equal to IB_QP_RATE_LIMIT.
560
+
*/
561
+
IB_USER_LAST_QP_ATTR_MASK = 1ULL << 25,
555
562
};
556
563
557
564
struct ib_uverbs_ex_create_qp {