diff options
author | Linus Torvalds | 2018-07-13 21:42:14 +0200 |
---|---|---|
committer | Linus Torvalds | 2018-07-13 21:42:14 +0200 |
commit | 4659fc8484b707c161b14324df0e3a2f5d03f050 (patch) | |
tree | 5f2e1dce44199e0ee19c7f1a7ed6c137b606798a /drivers/infiniband/hw/hfi1/verbs_txreq.h | |
parent | Merge tag 'vfio-v4.18-rc5' of git://github.com/awilliam/linux-vfio (diff) | |
parent | RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path (diff) | |
download | kernel-qcow2-linux-4659fc8484b707c161b14324df0e3a2f5d03f050.tar.gz kernel-qcow2-linux-4659fc8484b707c161b14324df0e3a2f5d03f050.tar.xz kernel-qcow2-linux-4659fc8484b707c161b14324df0e3a2f5d03f050.zip |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Pull rdma fixes from Jason Gunthorpe:
"Things have been quite slow, only 6 RC patches have been sent to the
list. Regression, user visible bugs, and crashing fixes:
- cxgb4 could wrongly fail MR creation due to a typo
- various crashes if the wrong QP type is mixed in with APIs that
expect other types
- syzkaller oops
- using ERR_PTR and NULL together cases HFI1 to crash in some cases
- mlx5 memory leak in error unwind"
* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
RDMA/mlx5: Fix memory leak in mlx5_ib_create_srq() error path
RDMA/uverbs: Don't fail in creation of multiple flows
IB/hfi1: Fix incorrect mixing of ERR_PTR and NULL return values
RDMA/uverbs: Fix slab-out-of-bounds in ib_uverbs_ex_create_flow
RDMA/uverbs: Protect from attempts to create flows on unsupported QP
iw_cxgb4: correctly enforce the max reg_mr depth
Diffstat (limited to 'drivers/infiniband/hw/hfi1/verbs_txreq.h')
-rw-r--r-- | drivers/infiniband/hw/hfi1/verbs_txreq.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/hfi1/verbs_txreq.h b/drivers/infiniband/hw/hfi1/verbs_txreq.h index 729244c3086c..1c19bbc764b2 100644 --- a/drivers/infiniband/hw/hfi1/verbs_txreq.h +++ b/drivers/infiniband/hw/hfi1/verbs_txreq.h @@ -1,5 +1,5 @@ /* - * Copyright(c) 2016 Intel Corporation. + * Copyright(c) 2016 - 2018 Intel Corporation. * * This file is provided under a dual BSD/GPLv2 license. When using or * redistributing this file, you may do so under either license. @@ -83,7 +83,7 @@ static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev, if (unlikely(!tx)) { /* call slow path to get the lock */ tx = __get_txreq(dev, qp); - if (IS_ERR(tx)) + if (!tx) return tx; } tx->qp = qp; |