remoteproc: Use struct_size() helper
PATCH 1/1 remoteproc: 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 resource_table {
...
u32 offset[0];
} __packed;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:
table->num * sizeof(table->offset[0]) + sizeof(struct resource_table)
with:
struct_size(table, offset, table->num)
This code was detected with the help of Coccinelle.
--- drivers/remoteproc/remoteproc_elf_loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/remoteproc/remoteproc_elf_loader.c +1 -2
@@ -247,8 +247,7 @@ find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) }/* make sure the offsets array isn't truncated */ -if (table->num *sizeof (table->offset[0 ]) + -sizeof (struct resource_table ) > size) { +if (struct_size (table, offset, table->num) > size) {dev_err (dev,"resource table incomplete\n" );return NULL ; }
Signature · 1 line
2.21.0
Quoted 16 lines · Gustavo A. R. Silva
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 resource_table { ... u32 offset[0]; } __packed;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:
table->num*sizeof(table->offset[0])+sizeof(struct resource_table)
Quoted 7 lines
with:
struct_size(table, offset, table->num)This code was detected with the help of Coccinelle.
Signed-off-by Gustavo A. R. Silva <[email protected]>
Looks good, applied
Thanks,
Bjorn
Quoted 21 lines
--- drivers/remoteproc/remoteproc_elf_loader.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)drivers/remoteproc/remoteproc_elf_loader.c +1
-2@@ -247,8 +247,7 @@ find_table(struct device *dev, struct elf32_hdr *ehdr, size_t fw_size) }/* make sure the offsets array isn't truncated */ -if (table->num *sizeof (table->offset[0 ]) + -sizeof (struct resource_table ) > size) { +if (struct_size (table, offset, table->num) > size) {dev_err (dev,"resource table incomplete\n" );return NULL ; }Signature · 1 line
2.21.0