writeback: prefer struct_size over open coded arithmetic
PATCH v2 1/1 writeback: prefer struct_size over open coded arithmetic
As noted in the "Deprecated Interfaces, Language Features, Attributes, and Conventions" documentation [1], size calculations (especially multiplication) should not be performed in memory allocator (or similar) function arguments due to the risk of them overflowing. This could lead to values wrapping around and a smaller allocation being made than the caller was expecting. Using those allocations could lead to linear overflows of heap memory and other misbehaviors.
In this case these are not actually dynamic sizes: all the operands involved in the calculation are constant values. However it is better to refactor them anyway, just to keep the open-coded math idiom out of code.
So, use the struct_size() helper to do the arithmetic instead of the argument "size + count * size" in the kzalloc() functions.
This code was detected with the help of Coccinelle and audited and fixed manually.
---
Changelog v1 -> v2
- Rebase against v5.15-rc2
- Refactor another instance in the same file (Gustavo A. R. Silva).
- Update the commit changelog to inform that this code was detected using a Coccinelle script (Gustavo A. R. Silva).
fs/fs-writeback.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/fs-writeback.c +3 -3
@@ -566,7 +566,7 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)if (atomic_read (&isw_nr_in_flight) >WB_FRN_MAX_IN_FLIGHT )return ; - isw =kzalloc (sizeof (*isw) +2 *sizeof (struct inode *),GFP_ATOMIC ); + isw =kzalloc (struct_size (isw, inodes,2 ),GFP_ATOMIC );if (!isw)return ;
@@ -624,8 +624,8 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)int nr;bool restart = false; - isw =kzalloc (sizeof (*isw) +WB_MAX_INODES_PER_ISW * -sizeof (struct inode *),GFP_KERNEL ); + isw =kzalloc (struct_size (isw, inodes,WB_MAX_INODES_PER_ISW ), +GFP_KERNEL );if (!isw)return restart;
--
2.25.1
Quoted 16 lines · Len Baker
As noted in the "Deprecated Interfaces, Language Features, Attributes, and Conventions" documentation [1], size calculations (especially multiplication) should not be performed in memory allocator (or similar) function arguments due to the risk of them overflowing. This could lead to values wrapping around and a smaller allocation being made than the caller was expecting. Using those allocations could lead to linear overflows of heap memory and other misbehaviors.
In this case these are not actually dynamic sizes: all the operands involved in the calculation are constant values. However it is better to refactor them anyway, just to keep the open-coded math idiom out of code.
So, use the
struct_size()helper to do the arithmetic instead of the argument "size + count * size" in thekzalloc()functions.
Quoted 6 lines
This code was detected with the help of Coccinelle and audited and fixed manually.
Signed-off-by Len Baker <[email protected]>
Thanks
--
Gustavo
Quoted 37 lines
---
Changelog v1 -> v2
- Rebase against v5.15-rc2
- Refactor another instance in the same file (Gustavo A. R. Silva).
- Update the commit changelog to inform that this code was detected using a Coccinelle script (Gustavo A. R. Silva).fs/fs-writeback.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/fs-writeback.c +3
-4@@ -566,7 +566,7 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)if (atomic_read (&isw_nr_in_flight) >WB_FRN_MAX_IN_FLIGHT )return ; - isw =kzalloc (sizeof (*isw) +2 *sizeof (struct inode *),GFP_ATOMIC ); + isw =kzalloc (struct_size (isw, inodes,2 ),GFP_ATOMIC );if (!isw)return ;@@ -624,8 +624,8 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)int nr;bool restart = false; - isw =kzalloc (sizeof (*isw) +WB_MAX_INODES_PER_ISW * -sizeof (struct inode *),GFP_KERNEL ); + isw =kzalloc (struct_size (isw, inodes,WB_MAX_INODES_PER_ISW ), +GFP_KERNEL );if (!isw)return restart; --2.25.1
Quoted 16 lines · Len Baker
As noted in the "Deprecated Interfaces, Language Features, Attributes, and Conventions" documentation [1], size calculations (especially multiplication) should not be performed in memory allocator (or similar) function arguments due to the risk of them overflowing. This could lead to values wrapping around and a smaller allocation being made than the caller was expecting. Using those allocations could lead to linear overflows of heap memory and other misbehaviors.
In this case these are not actually dynamic sizes: all the operands involved in the calculation are constant values. However it is better to refactor them anyway, just to keep the open-coded math idiom out of code.
So, use the
struct_size()helper to do the arithmetic instead of the argument "size + count * size" in thekzalloc()functions.
Quoted 6 lines
This code was detected with the help of Coccinelle and audited and fixed manually.
Signed-off-by Len Baker <[email protected]>
Looks good. Feel free to add:
BTW, writeback patches are usually merged by Andrew Morton so probably send it to him. Thanks!
Honza
Quoted 37 lines
---
Changelog v1 -> v2
- Rebase against v5.15-rc2
- Refactor another instance in the same file (Gustavo A. R. Silva).
- Update the commit changelog to inform that this code was detected using a Coccinelle script (Gustavo A. R. Silva).fs/fs-writeback.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/fs-writeback.c +3
-4@@ -566,7 +566,7 @@ static void inode_switch_wbs(struct inode *inode, int new_wb_id)if (atomic_read (&isw_nr_in_flight) >WB_FRN_MAX_IN_FLIGHT )return ; - isw =kzalloc (sizeof (*isw) +2 *sizeof (struct inode *),GFP_ATOMIC ); + isw =kzalloc (struct_size (isw, inodes,2 ),GFP_ATOMIC );if (!isw)return ;@@ -624,8 +624,8 @@ bool cleanup_offline_cgwb(struct bdi_writeback *wb)int nr;bool restart = false; - isw =kzalloc (sizeof (*isw) +WB_MAX_INODES_PER_ISW * -sizeof (struct inode *),GFP_KERNEL ); + isw =kzalloc (struct_size (isw, inodes,WB_MAX_INODES_PER_ISW ), +GFP_KERNEL );if (!isw)return restart; --2.25.1
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
On Wed, Oct 20, 2021 at 04:40:44PM +0200, Jan Kara wrote:
[..]
Quoted 5 lines
Quoted 5 lines
This code was detected with the help of Coccinelle and audited and fixed manually.
Quoted 8 lines
Quoted 1 line
Signed-off-by Len Baker <[email protected]>Looks good. Feel free to add:
Reviewed-by Jan Kara <[email protected]>BTW, writeback patches are usually merged by Andrew Morton so probably send it to him. Thanks!
I'm taking this in my -next tree.
Thank you both, Len and Jan.
--
Gustavo