scsi: advansys: Prefer struct_size over open coded arithmetic
Subsystems (2)
PATCH 1/1 scsi: advansys: 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.
So, refactor the code a bit to use the struct_size() helper instead of the argument "size + count * size" in the kzalloc() function.
--- drivers/scsi/advansys.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/advansys.c +3 -2
@@ -7465,6 +7465,7 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ASC_BUSY ; }else if (use_sg >0 ) {int sgcnt; +size_t size;struct scatterlist *slp;struct asc_sg_head *asc_sg_head;
@@ -7477,8 +7478,8 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ASC_ERROR ; } - asc_sg_head =kzalloc (sizeof (asc_scsi_q->sg_head) + - use_sg *sizeof (struct asc_sg_list ),GFP_ATOMIC ); + size =struct_size (asc_scsi_q->sg_head, sg_list, use_sg); + asc_sg_head =kzalloc (size,GFP_ATOMIC );if (!asc_sg_head) {scsi_dma_unmap (scp);set_host_byte (scp,DID_SOFT_ERROR );
--
2.25.1
Quoted 23 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.
So, refactor the code a bit to use the
struct_size()helper instead of the argument "size + count * size" in thekzalloc()function.Signed-off-by Len Baker <[email protected]>--- drivers/scsi/advansys.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/scsi/advansys.c +0
-0
drivers/scsi/advansys.c static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, · line 7468
Quoted 4 lines
drivers/scsi/advansys.c +1
-0@@ -7465,6 +7465,7 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ASC_BUSY ; }else if (use_sg >0 ) {int sgcnt; +size_t size;
I don't think a new variable is needed.
drivers/scsi/advansys.c static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp, · line 7482
Quoted 11 lines
drivers/scsi/advansys.c +2
-2struct scatterlist *slp;struct asc_sg_head *asc_sg_head;@@ -7477,8 +7478,8 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ASC_ERROR ; } - asc_sg_head =kzalloc (sizeof (asc_scsi_q->sg_head) + - use_sg *sizeof (struct asc_sg_list ),GFP_ATOMIC ); + size =struct_size (asc_scsi_q->sg_head, sg_list, use_sg); + asc_sg_head =kzalloc (size,GFP_ATOMIC );
You can go with this:
drivers/scsi/advansys.c +2 -2
@@ -7477,8 +7477,8 @@ static int asc_build_req(struct asc_board *boardp, struct scsi_cmnd *scp,return ASC_ERROR ; } - asc_sg_head =kzalloc (sizeof (asc_scsi_q->sg_head) + - use_sg *sizeof (struct asc_sg_list ),GFP_ATOMIC ); + asc_sg_head =kzalloc (struct_size (asc_sg_head, sg_list, use_sg), +GFP_ATOMIC );if (!asc_sg_head) {scsi_dma_unmap (scp);set_host_byte (scp,DID_SOFT_ERROR );
It perfectly fits withing the 80 columns, which by the way is deprecated but still good-to-have.
Also, if you are finding these instances with the help of Coccinelle, it'd be nice if you mention that in the changelog text. :)
Thanks!
--
Gustavo
Quoted 6 lines
drivers/scsi/advansys.c +0
-1if (!asc_sg_head) {scsi_dma_unmap (scp);set_host_byte (scp,DID_SOFT_ERROR ); --2.25.1