diff options
author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2018-08-24 03:07:06 +0200 |
---|---|---|
committer | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2018-08-27 23:10:31 +0200 |
commit | f62df676d7f16580fa5085a8f51a1cbe27f7dd10 (patch) | |
tree | bb4461e296a1c7b3e26bd1460825794712247b43 | |
parent | Linux 4.19-rc1 (diff) | |
download | linux-f62df676d7f16580fa5085a8f51a1cbe27f7dd10.tar.xz linux-f62df676d7f16580fa5085a8f51a1cbe27f7dd10.zip |
memory: atmel-ebi: Use struct_size() in devm_kzalloc()
One of the more common cases of allocation size calculations is finding
the size of a structure that has a zero-sized array at the end, along
with memory for some number of elements for that array. For example:
struct foo {
int stuff;
void *entry[];
};
instance = devm_kzalloc(dev, sizeof(struct foo) + sizeof(void *) * count, GFP_KERNEL);
Instead of leaving these open-coded and prone to type mistakes, we can
now use the new struct_size() helper:
instance = devm_kzalloc(dev, struct_size(instance, entry, count), GFP_KERNEL);
This issue was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
-rw-r--r-- | drivers/memory/atmel-ebi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c index b907865d4664..c3748b414c27 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -327,8 +327,7 @@ static int atmel_ebi_dev_setup(struct atmel_ebi *ebi, struct device_node *np, return -EINVAL; } - ebid = devm_kzalloc(ebi->dev, - sizeof(*ebid) + (numcs * sizeof(*ebid->configs)), + ebid = devm_kzalloc(ebi->dev, struct_size(ebid, configs, numcs), GFP_KERNEL); if (!ebid) return -ENOMEM; |