cifs: misc: Use array_size() in if-statement controlling expression
Subsystems (2)
PATCH 1/1 cifs: misc: Use array_size() in if-statement controlling expression
Use array_size() instead of the open-coded version in the controlling expression of the if statement.
Also, while there, use the preferred form for passing a size of a struct. The alternative form where struct name is spelled out hurts readability and introduces an opportunity for a bug when the pointer variable type is changed but the corresponding sizeof that is passed as argument is not.
This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
--- fs/cifs/misc.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-)
fs/cifs/misc.c +7 -9
@@ -844,28 +844,26 @@ setup_aio_ctx_iter(struct cifs_aio_ctx *ctx, struct iov_iter *iter, int rw)struct bio_vec *bv =NULL ;if (iov_iter_is_kvec (iter)) { -memcpy (&ctx->iter, iter,sizeof (struct iov_iter )); +memcpy (&ctx->iter, iter,sizeof (*iter)); ctx->len = count;iov_iter_advance (iter, count);return 0 ; } -if (max_pages *sizeof (struct bio_vec ) <=CIFS_AIO_KMALLOC_LIMIT ) - bv =kmalloc_array (max_pages,sizeof (struct bio_vec ), -GFP_KERNEL ); +if (array_size (max_pages,sizeof (*bv)) <=CIFS_AIO_KMALLOC_LIMIT ) + bv =kmalloc_array (max_pages,sizeof (*bv),GFP_KERNEL );if (!bv) { - bv =vmalloc (array_size (max_pages,sizeof (struct bio_vec ))); + bv =vmalloc (array_size (max_pages,sizeof (*bv)));if (!bv)return -ENOMEM ; } -if (max_pages *sizeof (struct page *) <=CIFS_AIO_KMALLOC_LIMIT ) - pages =kmalloc_array (max_pages,sizeof (struct page *), -GFP_KERNEL ); +if (array_size (max_pages,sizeof (*pages)) <=CIFS_AIO_KMALLOC_LIMIT ) + pages =kmalloc_array (max_pages,sizeof (*pages),GFP_KERNEL );if (!pages) { - pages =vmalloc (array_size (max_pages,sizeof (struct page *))); + pages =vmalloc (array_size (max_pages,sizeof (*pages)));if (!pages) {kvfree (bv);return -ENOMEM ;
Signature · 1 line
2.27.0
Cheers,
Signature · 4 lines
Aurélien Aptel / SUSE Labs Samba Team GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3 SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
Quoted 8 lines · Gustavo A. R. Silva
Use
array_size()instead of the open-coded version in the controlling expression of the if statement.Also, while there, use the preferred form for passing a size of a struct. The alternative form where struct name is spelled out hurts readability and introduces an opportunity for a bug when the pointer variable type is changed but the corresponding sizeof that is passed as argument is not.
Quoted 5 lines
This issue was found with the help of Coccinelle and, audited and fixed manually.
Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83
Signed-off-by Gustavo A. R. Silva <[email protected]>
Signature · 1 line
Kees Cook
Added the two reviewed-bys and merged into cifs-2.6.git for-next
Quoted 10 lines · Aurélien Aptel via samba-technical
Reviewed-by Aurelien Aptel <[email protected]>Cheers,
--
Aurélien Aptel / SUSE Labs Samba Team
GPG: 1839 CB5F 9F5B FB9B AA97 8C99 03C8 A49B 521B D5D3
SUSE Software Solutions Germany GmbH, Maxfeldstr. 5, 90409 Nürnberg, DE
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah HRB 247165 (AG München)
Signature · 3 lines
Thanks, Steve