[ 22/82] NFS: kmalloc() doesnt return an ERR_PTR()
From: Greg KH <gregkh@linuxfoundation.org>
Date: 2012-06-07 04:16:56
Also in:
lkml
3.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dan Carpenter <redacted> commit 5abc03cd919535c61b813f2319cb38326a41e810 upstream. Obviously we should check for NULL here instead of IS_ERR(). Signed-off-by: Dan Carpenter <redacted> Signed-off-by: Trond Myklebust <redacted> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- fs/nfs/idmap.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c@@ -640,20 +640,16 @@ static int nfs_idmap_legacy_upcall(struc 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)