diff options
| author | Gustavo A. R. Silva <gustavo@embeddedor.com> | 2019-06-06 20:18:53 +0200 |
|---|---|---|
| committer | Jessica Yu <jeyu@kernel.org> | 2019-06-07 10:56:32 +0200 |
| commit | 8d1b73dd25ff92c3fa9807a20c22fa2b44c07336 (patch) | |
| tree | 6212b290118a7f3c96aff18c0c1bac6da62b297f | |
| parent | kernel/module.c: Only return -EEXIST for modules that have finished loading (diff) | |
| download | linux-8d1b73dd25ff92c3fa9807a20c22fa2b44c07336.tar.xz linux-8d1b73dd25ff92c3fa9807a20c22fa2b44c07336.zip | |
kernel: module: Use struct_size() helper
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 module_sect_attrs {
...
struct module_sect_attr attrs[0];
};
Make use of the struct_size() helper instead of an open-coded version
in order to avoid any potential type mistakes.
So, replace the following form:
sizeof(*sect_attrs) + nloaded * sizeof(sect_attrs->attrs[0]
with:
struct_size(sect_attrs, attrs, nloaded)
This code was detected with the help of Coccinelle.
Signed-off-by: Gustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: Jessica Yu <jeyu@kernel.org>
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 1e7dcbe527af..1a0d8cab9eb7 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1504,8 +1504,7 @@ static void add_sect_attrs(struct module *mod, const struct load_info *info) for (i = 0; i < info->hdr->e_shnum; i++) if (!sect_empty(&info->sechdrs[i])) nloaded++; - size[0] = ALIGN(sizeof(*sect_attrs) - + nloaded * sizeof(sect_attrs->attrs[0]), + size[0] = ALIGN(struct_size(sect_attrs, attrs, nloaded), sizeof(sect_attrs->grp.attrs[0])); size[1] = (nloaded + 1) * sizeof(sect_attrs->grp.attrs[0]); sect_attrs = kzalloc(size[0] + size[1], GFP_KERNEL); |