Skip to content

Commit

Permalink
NFS: kmalloc() doesn't return an ERR_PTR()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Trond Myklebust committed May 15, 2012
1 parent 36be505 commit 5abc03c
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions fs/nfs/idmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5abc03c

Please sign in to comment.