target/iscsi: cleanup some allocation style issues

We can use kcalloc() here instead of kzalloc().  It's better style and
it has overflow checking built in.

Also -ENOMEM is the correct error code for allocation errors.  -1 means
-EPERM.  None of the callers preserve the error codes so it doesn't
matter except as a cleanup.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/iscsi/iscsi_target_seq_pdu_list.c b/drivers/target/iscsi/iscsi_target_seq_pdu_list.c
index 7d0effad939699f820a9cafc7b4f99b652e2ce51..85a306e067ba81dd693523683e93d0e5534fb49c 100644 (file)
--- a/drivers/target/iscsi/iscsi_target_seq_pdu_list.c
+++ b/drivers/target/iscsi/iscsi_target_seq_pdu_list.c
@@ -141,11 +141,11 @@ redo:
                        seq_count++;
                        continue;
                }
-               array = kzalloc(seq_count * sizeof(u32), GFP_KERNEL);
+               array = kcalloc(seq_count, sizeof(u32), GFP_KERNEL);
                if (!array) {
                        pr_err("Unable to allocate memory"
                                " for random array.\n");
-                       return -1;
+                       return -ENOMEM;
                }
                iscsit_create_random_array(array, seq_count);
 
@@ -161,11 +161,11 @@ redo:
        }
 
        if (seq_count) {
-               array = kzalloc(seq_count * sizeof(u32), GFP_KERNEL);
+               array = kcalloc(seq_count, sizeof(u32), GFP_KERNEL);
                if (!array) {
                        pr_err("Unable to allocate memory for"
                                " random array.\n");
-                       return -1;
+                       return -ENOMEM;
                }
                iscsit_create_random_array(array, seq_count);
 
@@ -193,10 +193,10 @@ static int iscsit_randomize_seq_lists(
        if (!seq_count)
                return 0;
 
-       array = kzalloc(seq_count * sizeof(u32), GFP_KERNEL);
+       array = kcalloc(seq_count, sizeof(u32), GFP_KERNEL);
        if (!array) {
                pr_err("Unable to allocate memory for random array.\n");
-               return -1;
+               return -ENOMEM;
        }
        iscsit_create_random_array(array, seq_count);
 
@@ -546,21 +546,21 @@ int iscsit_build_pdu_and_seq_lists(
        iscsit_determine_counts_for_list(cmd, &bl, &seq_count, &pdu_count);
 
        if (!conn->sess->sess_ops->DataSequenceInOrder) {
-               seq = kzalloc(seq_count * sizeof(struct iscsi_seq), GFP_ATOMIC);
+               seq = kcalloc(seq_count, sizeof(struct iscsi_seq), GFP_ATOMIC);
                if (!seq) {
                        pr_err("Unable to allocate struct iscsi_seq list\n");
-                       return -1;
+                       return -ENOMEM;
                }
                cmd->seq_list = seq;
                cmd->seq_count = seq_count;
        }
 
        if (!conn->sess->sess_ops->DataPDUInOrder) {
-               pdu = kzalloc(pdu_count * sizeof(struct iscsi_pdu), GFP_ATOMIC);
+               pdu = kcalloc(pdu_count, sizeof(struct iscsi_pdu), GFP_ATOMIC);
                if (!pdu) {
                        pr_err("Unable to allocate struct iscsi_pdu list.\n");
                        kfree(seq);
-                       return -1;
+                       return -ENOMEM;
                }
                cmd->pdu_list = pdu;
                cmd->pdu_count = pdu_count;