AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

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

Browse Source 
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>
This commit is contained in:
Dan Carpenter 2012-05-14 22:45:28 +03:00 committed by Trond Myklebust
parent 36be50515f
commit 5abc03cd91
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfs/idmap.c
View File

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