Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1616959

[PATCH 4/5] IB/qib: Use kcalloc() in qib_init_pportdata()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 5 Apr 2017 14:20:10 +0200

* Multiplications for the size determination of memory allocations
  indicated that array data structures should be processed.
  Thus use the corresponding function "kcalloc".

  This issue was detected by using the Coccinelle software.

* Replace the specification of data structures by pointer dereferences
  to make the corresponding size determination a bit safer according to
  the Linux coding style convention.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/infiniband/hw/qib/qib_init.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index 9e680ca971e3..101580f0460a 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -258,15 +258,15 @@ int qib_init_pportdata(struct qib_pportdata *ppd, struct qib_devdata *dd,
 
 	ppd->cc_max_table_entries =
 		ppd->cc_supported_table_entries/IB_CCT_ENTRIES;
-
-	size = IB_CC_TABLE_CAP_DEFAULT * sizeof(struct ib_cc_table_entry)
-		* IB_CCT_ENTRIES;
-	ppd->ccti_entries = kzalloc(size, GFP_KERNEL);
+	ppd->ccti_entries = kcalloc(IB_CC_TABLE_CAP_DEFAULT * IB_CCT_ENTRIES,
+				    sizeof(*ppd->ccti_entries),
+				    GFP_KERNEL);
 	if (!ppd->ccti_entries)
 		goto bail;
 
-	size = IB_CC_CCS_ENTRIES * sizeof(struct ib_cc_congestion_entry);
-	ppd->congestion_entries = kzalloc(size, GFP_KERNEL);
+	ppd->congestion_entries = kcalloc(IB_CC_CCS_ENTRIES,
+					  sizeof(*ppd->congestion_entries),
+					  GFP_KERNEL);
 	if (!ppd->congestion_entries)
 		goto bail_1;
 
-- 
2.12.2

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/5] IB/qib: Fine-tuning for four function implementations SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 16:00 +0200
  [PATCH 2/5] IB/qib: Use kmalloc_array() in qib_init_7322_variables() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 16:00 +0200
    Re: [PATCH 2/5] IB/qib: Use kmalloc_array() in  qib_init_7322_variables() Yuval Shaia <yuval.shaia@oracle.com> - 2017-04-05 16:30 +0200
  [PATCH 1/5] IB/qib: Use kcalloc() in qib_init_iba7322_funcs() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 16:00 +0200
    Re: [PATCH 1/5] IB/qib: Use kcalloc() in qib_init_iba7322_funcs() Yuval Shaia <yuval.shaia@oracle.com> - 2017-04-05 16:40 +0200
      Re: [PATCH 1/5] IB/qib: Use kcalloc() in qib_init_iba7322_funcs() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 17:00 +0200
        Re: [PATCH 1/5] IB/qib: Use kcalloc() in qib_init_iba7322_funcs() Johannes Thumshirn <jthumshirn@suse.de> - 2017-04-05 17:10 +0200
          Re: [PATCH 1/5] IB/qib: Use kcalloc() in qib_init_iba7322_funcs() Yuval Shaia <yuval.shaia@oracle.com> - 2017-04-05 17:20 +0200
  [PATCH 3/5] IB/qib: Use kcalloc() in qib_alloc_devdata() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 16:00 +0200
  [PATCH 4/5] IB/qib: Use kcalloc() in qib_init_pportdata() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 16:00 +0200
  [PATCH 5/5] IB/qib: Adjust two size determinations in  qib_init_pportdata() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 16:10 +0200
    Re: [PATCH 5/5] IB/qib: Adjust two size determinations in  qib_init_pportdata() Yuval Shaia <yuval.shaia@oracle.com> - 2017-04-05 16:40 +0200
      Re: [PATCH 5/5] IB/qib: Adjust two size determinations in  qib_init_pportdata() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 17:10 +0200
        Re: [PATCH 5/5] IB/qib: Adjust two size determinations in  qib_init_pportdata() Yuval Shaia <yuval.shaia@oracle.com> - 2017-04-05 17:20 +0200
          Re: IB/qib: Adjust two size determinations in qib_init_pportdata() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-05 17:30 +0200
            Re: IB/qib: Adjust two size determinations in qib_init_pportdata() Yuval Shaia <yuval.shaia@oracle.com> - 2017-04-06 21:50 +0200
              Re: IB/qib: Adjust two size determinations in qib_init_pportdata() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-04-06 22:40 +0200
    Re: [PATCH 5/5] IB/qib: Adjust two size determinations in  qib_init_pportdata() Bart Van Assche <Bart.VanAssche@sandisk.com> - 2017-04-05 17:20 +0200
  Re: [PATCH 0/5] IB/qib: Fine-tuning for four function implementations Dennis Dalessandro <dennis.dalessandro@intel.com> - 2017-04-06 02:40 +0200

csiph-web