From: SF Markus Elfring <elfring@users.sourceforge.net>
To: devel@driverdev.osuosl.org, Alex Elder <elder@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Johan Hovold <johan@kernel.org>,
Rui Miguel Silva <rmfrfs@gmail.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/4] staging: greybus: light: Use kcalloc() in two functions
Date: Fri, 09 Dec 2016 14:36:12 +0000 [thread overview]
Message-ID: <112064ca-41b3-6936-090a-3c229a251af7@users.sourceforge.net> (raw)
In-Reply-To: <a2db1eee-eb2c-07b6-2144-3e262facbef9@users.sourceforge.net>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 9 Dec 2016 13:46:25 +0100
* 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.
Fixes: 2870b52bae4c81823ffcb3ed2b0626fb39d64f48 ("greybus: lights: add lights implementation")
Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/staging/greybus/light.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c
index 8dffd8a7e762..27bfc20eb9a5 100644
--- a/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@ -1030,9 +1030,9 @@ static int gb_lights_light_config(struct gb_lights *glights, u8 id)
light->channels_count = conf.channel_count;
light->name = kstrndup(conf.name, NAMES_MAX, GFP_KERNEL);
-
- light->channels = kzalloc(light->channels_count *
- sizeof(struct gb_channel), GFP_KERNEL);
+ light->channels = kcalloc(light->channels_count,
+ sizeof(*light->channels),
+ GFP_KERNEL);
if (!light->channels)
return -ENOMEM;
@@ -1168,8 +1168,9 @@ static int gb_lights_create_all(struct gb_lights *glights)
if (ret < 0)
goto out;
- glights->lights = kzalloc(glights->lights_count *
- sizeof(struct gb_light), GFP_KERNEL);
+ glights->lights = kcalloc(glights->lights_count,
+ sizeof(*glights->lights),
+ GFP_KERNEL);
if (!glights->lights) {
ret = -ENOMEM;
goto out;
--
2.11.0
next prev parent reply other threads:[~2016-12-09 14:36 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-09 14:32 [PATCH 0/4] staging-greybus: Fine-tuning for four functions SF Markus Elfring
2016-12-09 14:34 ` [PATCH 1/4] staging: greybus: camera: One function call less in gb_camera_configure_streams() after SF Markus Elfring
2016-12-09 14:36 ` SF Markus Elfring [this message]
2016-12-09 14:37 ` [PATCH 3/4] staging: greybus: light: Check return value of a kstrndup() call in gb_lights_light_conf SF Markus Elfring
2016-12-09 14:40 ` [PATCH 4/4] staging: greybus: power_supply: Use kcalloc() in gb_power_supplies_setup() SF Markus Elfring
2016-12-09 14:53 ` [PATCH 0/4] staging-greybus: Fine-tuning for four functions Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=112064ca-41b3-6936-090a-3c229a251af7@users.sourceforge.net \
--to=elfring@users.sourceforge.net \
--cc=devel@driverdev.osuosl.org \
--cc=elder@kernel.org \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rmfrfs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox