NFS: kmalloc() doesn't return an ERR_PTR()

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

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: stable@vger.kernel.org [3.4]
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index ba3019f5934c..3e8edbe71ec6 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -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)