From: Julien Brunel <brunel@diku.dk>
Date: Fri, 10 Oct 2008 19:00:19 +0000 (-0700)
Subject: RDMA/ucma: Test ucma_alloc_multicast() return against NULL, not with IS_ERR()
X-Git-Tag: v2.6.28-rc1~61^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6aea938f54ca785ce3bea67a8948698225c6ca58;p=linux-2.6-omap-h63xx.git

RDMA/ucma: Test ucma_alloc_multicast() return against NULL, not with IS_ERR()

In case of error, the function ucma_alloc_multicast() returns a NULL
pointer, but never returns an ERR pointer.  So after a call to this
function, an IS_ERR test should be replaced by a NULL test.

The semantic match that finds this problem is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@match bad_is_err_test@
expression x, E;
@@

x = ucma_alloc_multicast(...)
... when != x = E
IS_ERR(x)
// </smpl>

Signed-off-by:  Julien Brunel <brunel@diku.dk>
Signed-off-by:  Julia Lawall <julia@diku.dk>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
---

diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c
index 3ddacf39b7b..4346a24568f 100644
--- a/drivers/infiniband/core/ucma.c
+++ b/drivers/infiniband/core/ucma.c
@@ -904,8 +904,8 @@ static ssize_t ucma_join_multicast(struct ucma_file *file,
 
 	mutex_lock(&file->mut);
 	mc = ucma_alloc_multicast(ctx);
-	if (IS_ERR(mc)) {
-		ret = PTR_ERR(mc);
+	if (!mc) {
+		ret = -ENOMEM;
 		goto err1;
 	}