NFS: kmalloc() doesn't return an ERR_PTR()
Dan Carpenter [Mon, 14 May 2012 19:45:28 +0000 (22:45 +0300)]
commit 5abc03cd919535c61b813f2319cb38326a41e810 upstream.

Obviously we should check for NULL here instead of IS_ERR().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

fs/nfs/idmap.c

index ba3019f..3e8edbe 100644 (file)
@@ -640,20 +640,16 @@ static int nfs_idmap_legacy_upcall(struct key_construction *cons,
        struct idmap_msg *im;
        struct idmap *idmap = (struct idmap *)aux;
        struct key *key = cons->key;
-       int ret;
+       int ret = -ENOMEM;
 
        /* msg and im are freed in idmap_pipe_destroy_msg */
        msg = kmalloc(sizeof(*msg), GFP_KERNEL);
-       if (IS_ERR(msg)) {
-               ret = PTR_ERR(msg);
+       if (!msg)
                goto out0;
-       }
 
        im = kmalloc(sizeof(*im), GFP_KERNEL);
-       if (IS_ERR(im)) {
-               ret = PTR_ERR(im);
+       if (!im)
                goto out1;
-       }
 
        ret = nfs_idmap_prepare_message(key->description, im, msg);
        if (ret < 0)