Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 5abc03cd919535c61b813f2319cb38326a41e810

Authored by Dan Carpenter
Committed by Trond Myklebust
1 parent 36be50515f
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 1 changed file with 3 additions and 7 deletions Side-by-side Diff

... ... @@ -640,20 +640,16 @@
640 640 struct idmap_msg *im;
641 641 struct idmap *idmap = (struct idmap *)aux;
642 642 struct key *key = cons->key;
643   - int ret;
  643 + int ret = -ENOMEM;
644 644  
645 645 /* msg and im are freed in idmap_pipe_destroy_msg */
646 646 msg = kmalloc(sizeof(*msg), GFP_KERNEL);
647   - if (IS_ERR(msg)) {
648   - ret = PTR_ERR(msg);
  647 + if (!msg)
649 648 goto out0;
650   - }
651 649  
652 650 im = kmalloc(sizeof(*im), GFP_KERNEL);
653   - if (IS_ERR(im)) {
654   - ret = PTR_ERR(im);
  651 + if (!im)
655 652 goto out1;
656   - }
657 653  
658 654 ret = nfs_idmap_prepare_message(key->description, im, msg);
659 655 if (ret < 0)