projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
aeef010
)
IB/hfi1: checking for NULL instead of IS_ERR
author
Dan Carpenter
<dan.carpenter@oracle.com>
Wed, 16 Sep 2015 06:22:20 +0000
(09:22 +0300)
committer
Doug Ledford
<dledford@redhat.com>
Fri, 18 Sep 2015 15:28:47 +0000
(11:28 -0400)
__get_txreq() returns an ERR_PTR() but this checks for NULL so it would
oops on failure.
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/staging/rdma/hfi1/verbs.c
patch
|
blob
|
history
diff --git
a/drivers/staging/rdma/hfi1/verbs.c
b/drivers/staging/rdma/hfi1/verbs.c
index 53ac21431542732a4cd3f2bc8a37a4110fcdeee9..41bb59eb001c72fe214a4114047fdf03156f9007 100644
(file)
--- a/
drivers/staging/rdma/hfi1/verbs.c
+++ b/
drivers/staging/rdma/hfi1/verbs.c
@@
-749,11
+749,13
@@
static inline struct verbs_txreq *get_txreq(struct hfi1_ibdev *dev,
struct verbs_txreq *tx;
tx = kmem_cache_alloc(dev->verbs_txreq_cache, GFP_ATOMIC);
- if (!tx)
+ if (!tx)
{
/* call slow path to get the lock */
tx = __get_txreq(dev, qp);
- if (tx)
- tx->qp = qp;
+ if (IS_ERR(tx))
+ return tx;
+ }
+ tx->qp = qp;
return tx;
}